configure.in, *.spec: Bumping release to 2 (2.9.14-2)

-rh.spec: uid and gid are now macros
-suse.spec: Changing the header Copyright to License (Copyright is
            deprecable)

diff --git a/configure.in b/configure.in
index c1748fc..655de55 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl 
-dnl $Id: configure.in,v 1.62 2002/04/11 10:09:20 oes Exp $
+dnl $Id: configure.in,v 1.63 2002/04/11 11:00:21 oes Exp $
 dnl 
 dnl Written by and Copyright (C) 2001, 2002 the SourceForge
 dnl Privoxy team. http://www.privoxy.org/
@@ -28,6 +28,9 @@ dnl or write to the Free Software Foundation, Inc., 59
 dnl Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 dnl 
 dnl $Log: configure.in,v $
+dnl Revision 1.63  2002/04/11 11:00:21  oes
+dnl Applied Moritz' fix for socklen_t on Solaris
+dnl
 dnl Revision 1.62  2002/04/11 10:09:20  oes
 dnl Version 2.9.14
 dnl
@@ -344,7 +347,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.62 $)
+AC_REVISION($Revision: 1.63 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -391,7 +394,7 @@ dnl =================================================================
 VERSION_MAJOR=2
 VERSION_MINOR=9
 VERSION_POINT=14
-VERSION_RPM_PACKAGE=1
+VERSION_RPM_PACKAGE=2
 CODE_STATUS="beta"
 
 dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be

diff --git a/privoxy-rh.spec b/privoxy-rh.spec
index 8177b35..8374fa6 100644 (file)
--- a/privoxy-rh.spec
+++ b/privoxy-rh.spec
@@ -1,4 +1,4 @@
-# $Id: privoxy-rh.spec,v 1.25 2002/04/17 01:59:12 hal9 Exp $
+# $Id: privoxy-rh.spec,v 1.26 2002/04/22 16:24:36 morcego Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -30,13 +30,15 @@
 %define veryoldname junkbust
 %define oldname junkbuster
 %define privoxyconf %{_sysconfdir}/%{name}
+%define privoxy_uid 73
+%define privoxy_gid 73
 
 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: 1
+Release: 2
 Summary: Privoxy - privacy enhancing proxy
 License: GPL
 Vendor: http://www.privoxy.org
@@ -143,14 +145,14 @@ done
 # Doing it by brute force. Much cleaner (no more Mr. Nice Guy) -- morcego
 
 # Change the group name. Remove anything left behind.
-groupmod -g 73 -n %{name} %{oldname} > /dev/null 2>&1 ||:
-groupmod -g 73 -n %{name} %{veryoldname} > /dev/null 2>&1 ||:
+groupmod -g %{privoxy_gid} -n %{name} %{oldname} > /dev/null 2>&1 ||:
+groupmod -g %{privoxy_gid} -n %{name} %{veryoldname} > /dev/null 2>&1 ||:
 groupdel %{oldname} > /dev/null 2>&1 ||:
 groupdel %{veryoldname} > /dev/null 2>&1 ||:
 
 # Same for username
-usermod -u 73 -g 73 -l %{name} -d %{_sysconfdir}/%{name} -s "" %{oldname} > /dev/null 2>&1 || :
-usermod -u 73 -g 73 -l %{name} -d %{_sysconfdir}/%{name} -s "" %{veryoldname} > /dev/null 2>&1 || :
+usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{oldname} > /dev/null 2>&1 || :
+usermod -u %{privoxy_uid} -g %{privoxy_gid} -l %{name} -d %{_sysconfdir}/%{name} -s "" %{veryoldname} > /dev/null 2>&1 || :
 userdel %{oldname} > /dev/null 2>&1 ||:
 userdel %{veryoldname} > /dev/null 2>&1 ||:
 
@@ -158,12 +160,12 @@ userdel %{veryoldname} > /dev/null 2>&1 ||:
 /bin/grep -E '^%{name}:' /etc/group > /dev/null 2>&1
 if [ $? -eq 1 ]; then
        # Looks like it does not exist. Create it
-       groupadd -g 73 %{name} > /dev/null 2>&1
+       groupadd -g %{privoxy_gid} %{name} > /dev/null 2>&1
 else
-       /bin/grep -E '^%{name}:[^:]*:73:' /etc/group > /dev/null 2>&1
+       /bin/grep -E '^%{name}:[^:]*:%{privoxy_gid}:' /etc/group > /dev/null 2>&1
        if [ $? -eq 1 ]; then
                # The group exists, but does not have the correct gid
-               groupmod -g 73 %{name} > /dev/null 2>&1
+               groupmod -g %{privoxy_gid} %{name} > /dev/null 2>&1
        fi
 fi
 
@@ -171,19 +173,19 @@ fi
 # exist
 id %{name} > /dev/null 2>&1
 if [ $? -eq 1 ]; then
-       /usr/sbin/useradd -u 73 -g 73 -d %{_sysconfdir}/%{name} -r -s "" %{name} > /dev/null 2>&1 
+       /usr/sbin/useradd -u %{privoxy_uid} -g %{privoxy_gid} -d %{_sysconfdir}/%{name} -r -s "" %{name} > /dev/null 2>&1 
 fi
 
 # Double check that the group has the correct uid
 P_UID=`id -u %{name} 2>/dev/null`
-if [ $P_UID -ne 73 ]; then
-       /usr/sbin/usermod -u 73 %{name}
+if [ $P_UID -ne %{privoxy_uid} ]; then
+       /usr/sbin/usermod -u %{privoxy_uid} %{name}
 fi
 
 # The same for the gid
 P_GID=`id -g %{name} 2>/dev/null`
-if [ $P_GID -ne 73 ]; then
-       /usr/sbin/usermod -g 73 %{name}
+if [ $P_GID -ne %{privoxy_gid} ]; then
+       /usr/sbin/usermod -g %{privoxy_gid} %{name}
 fi
 
 %post
@@ -297,6 +299,11 @@ fi
 %{_mandir}/man1/%{name}.*
 
 %changelog
+* Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
++ privoxy-2.9.14-2
+- Using macros to define uid and gid values
+- Bumping release
+
 * Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
 + privoxy-2.9.14-1
 - Changes to fixate the uid and gid values as (both) 73. This is a 
@@ -609,6 +616,15 @@ fi
        additional "-r @" flag.
 
 # $Log: privoxy-rh.spec,v $
+# Revision 1.26  2002/04/22 16:24:36  morcego
+# - Changes to fixate the uid and gid values as (both) 73. This is a
+#   value we hope to standarize for all distributions. RedHat already
+#   uses it, and Conectiva should start as soon as I find where the heck
+#   I left my cluebat :-)
+# - Only remove the user and group on uninstall if this is not redhat, once
+#   redhat likes to have the values allocated even if the package is not
+#   installed
+#
 # Revision 1.25  2002/04/17 01:59:12  hal9
 # Add --disable-dynamic-pcre.
 #

diff --git a/privoxy-suse.spec b/privoxy-suse.spec
index 971fedc..0fe6a77 100644 (file)
--- a/privoxy-suse.spec
+++ b/privoxy-suse.spec
@@ -1,4 +1,4 @@
-# $Id: privoxy-suse.spec,v 1.14 2002/04/11 17:57:40 oes Exp $
+# $Id: privoxy-suse.spec,v 1.15 2002/04/16 18:49:07 oes Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -34,13 +34,13 @@ Vendor:       http://www.privoxy.org
 Name:         privoxy-suse
 Distribution: defineme
 Version: 2.9.14
-Release: 1
+Release: 2
 # 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Packager:     Stefan Waldherr <stefan@waldherr.org>
-Copyright:    GPL
+License:    GPL
 Group:        Networking/Utilities
 URL:          http://www.privoxy.org/
 Autoreqprov:  on
@@ -211,6 +211,13 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true
 # -----------------------------------------------------------------------------
 #
 %changelog
+* Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
++ privoxy-suse-2.9.14-2
+- Bumping release to reflect the new value on configure.in
+- Taking the oportunity to change the header Copyright to License. The
+  Copyright headers is deprecated, and after all, GPL is a license, not a
+  Copyright
+
 * Mon Apr 08 2002 Hal Burgiss <hal@foobox.net>
 + privoxy-2.9.13-4
 - Add LICENSE.gz, p_web.css, and index.html. Add autoconf
@@ -296,6 +303,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.15  2002/04/16 18:49:07  oes
+# Build with static built-in pcre
+#
 # Revision 1.14  2002/04/11 17:57:40  oes
 # Fixed(?) Conflicts: Provides: Obsoletes:
 #