From 823af3a09c58d49932e31e8b8c8c72921355b588 Mon Sep 17 00:00:00 2001 From: morcego Date: Fri, 3 May 2002 17:14:36 +0000 Subject: [PATCH] *.spec: Version bump to 2.9.15 -rh.spec: noreplace for %%{privoxyconf}/config Will interrupt the build if versions from configure.in and specfile do not match --- privoxy-rh.spec | 31 +++++++++++++++++++++++++++---- privoxy-suse.spec | 13 ++++++++++--- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/privoxy-rh.spec b/privoxy-rh.spec index c747cee1..c20ec4d5 100644 --- a/privoxy-rh.spec +++ b/privoxy-rh.spec @@ -1,4 +1,4 @@ -# $Id: privoxy-rh.spec,v 1.29 2002/04/24 03:13:51 hal9 Exp $ +# $Id: privoxy-rh.spec,v 1.30 2002/04/26 15:51:05 morcego Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -37,8 +37,8 @@ Name: privoxy # ATTENTION # Version and release should be updated acordingly on configure.in and # configure. Otherwise, the package can be build with the wrong value -Version: 2.9.14 -Release: 3 +Version: 2.9.15 +Release: 1 Summary: Privoxy - privacy enhancing proxy License: GPL Vendor: Privoxy.Org @@ -66,6 +66,19 @@ Privoxy is based on the Internet Junkbuster. %setup -q -c %build + +# We check to see if versions match +VERSION_MAJOR=2 +VERSION_MINOR=9 +VERSION_POINT=15 + +CONFIG_VERSION=`cat configure.in | sed -n -e 's/^VERSION_MAJOR=\([0-9]*\)/\1./p' -e 's/^VERSION_MINOR=\([0-9]*\)/\1./p' -e 's/^VERSION_POINT=\([0-9]*\)/\1/p' | awk '{printf $1}'` +if [ "%{version}" != "${CONFIG_VERSION}" ]; then + echo "The version declared on the specfile does not match the version" + echo "declared on configure.in. This should not happen. The build will" + echo "be interrupted now, so you can fix it." + exit 1 +fi autoheader autoconf %configure --disable-dynamic-pcre @@ -241,7 +254,7 @@ fi # We should not use wildchars here. This could mask missing files problems # -- morcego # WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! -%config %{privoxyconf}/config +%config(noreplace) %{privoxyconf}/config %config %{privoxyconf}/standard.action %config(noreplace) %{privoxyconf}/user.action %config %{privoxyconf}/default.action @@ -293,6 +306,13 @@ fi %{_mandir}/man1/%{name}.* %changelog +* Fri May 03 2002 Rodrigo Barbosa ++ privoxy-2.9.15-1 +- Version bump +- Adding noreplace for %%{privoxyconf}/config +- Included a method to verify if the versions declared on the specfile and + configure.in match. Interrupt the build if they don't. + * Fri Apr 26 2002 Rodrigo Barbosa + privoxy-2.9.14-3 - Changing Vendor to Privoxy.Org @@ -624,6 +644,9 @@ fi additional "-r @" flag. # $Log: privoxy-rh.spec,v $ +# Revision 1.30 2002/04/26 15:51:05 morcego +# Changing Vendor value to Privoxy.Org +# # Revision 1.29 2002/04/24 03:13:51 hal9 # New actions files changes. # diff --git a/privoxy-suse.spec b/privoxy-suse.spec index 0101fbbd..ffdf7b6c 100644 --- a/privoxy-suse.spec +++ b/privoxy-suse.spec @@ -1,4 +1,4 @@ -# $Id: privoxy-suse.spec,v 1.17 2002/04/26 15:51:05 morcego Exp $ +# $Id: privoxy-suse.spec,v 1.18 2002/04/27 20:26:59 swa Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -36,8 +36,8 @@ Summary: Privoxy - privacy enhancing proxy Vendor: Privoxy.Org Name: privoxy-suse Distribution: defineme -Version: 2.9.14 -Release: 3 +Version: 2.9.15 +Release: 1 # Needs makefile change: Source: http://prdownloads.sourceforge.net/ijbswa/privoxy-%{version}-%{status}-src.tar.gz Source: http://prdownloads.sourceforge.net/ijbswa/privoxy-%{version}.tar.gz # not sure if this works @@ -214,6 +214,10 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true # ----------------------------------------------------------------------------- # %changelog +* Fri May 03 2002 Rodrigo Barbosa ++ privoxy-suse-2.9.15-1 +- Version bump + * Fri Apr 26 2002 Rodrigo Barbosa + privoxy-suse-2.9.14-3 - Changing Vendor to Privoxy.Org @@ -310,6 +314,9 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true - new package: version 2.0 # $Log: privoxy-suse.spec,v $ +# Revision 1.18 2002/04/27 20:26:59 swa +# uid, gui 73 incorporated +# # Revision 1.17 2002/04/26 15:51:05 morcego # Changing Vendor value to Privoxy.Org # -- 2.39.2