-# $Id: privoxy-rh.spec,v 1.26 2002/04/22 16:24:36 morcego Exp $
+# $Id: privoxy-rh.spec,v 1.28 2002/04/22 18:51:33 morcego Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# Privoxy team. http://www.privoxy.org/
#fi
# We only remove it we this is not an upgrade
if [ "$1" = "0" ]; then
- # And only if this is not redhat, once redhat likes to have
- # the uid and gid allocated even if the package is not
- # installed
- if [ ! -r /etc/redhat-release ]; then
- /bin/grep -E '^%{name}:' /etc/group > /dev/null && /usr/sbin/groupdel %{name} || /bin/true
- id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true
- fi
+ /bin/grep -E '^%{name}:' /etc/group > /dev/null && /usr/sbin/groupdel %{name} || /bin/true
+ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true
fi
%clean
# -- morcego
# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
%config %{privoxyconf}/config
-%config %{privoxyconf}/advanced.action
-%config %{privoxyconf}/basic.action
-%config %{privoxyconf}/intermediate.action
+%config %{privoxyconf}/standard.action
+%config(noreplace) %{privoxyconf}/user.action
%config %{privoxyconf}/default.action
%config %{privoxyconf}/default.filter
%config %{privoxyconf}/trust
%{_mandir}/man1/%{name}.*
%changelog
+* Tue Apr 23 2002 Hal Burgiss <hal@foobox.net>
++ privoxy-2.9.14-2
+- Adjust for new *actions files.
+
+* Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
++ privoxy-2.9.14-2
+- Removed the redhat hack that prevented the user and group from
+ being dealocated. That was a misundestanding of my part regarding
+ redhat policy.
+
* Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
+ privoxy-2.9.14-2
- Using macros to define uid and gid values
additional "-r @" flag.
# $Log: privoxy-rh.spec,v $
+# Revision 1.28 2002/04/22 18:51:33 morcego
+# user and group now get removed on rh too.
+#
+# Revision 1.27 2002/04/22 16:32:31 morcego
+# 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)
+#
# 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