Enable web editing of actions file on OS/2 (it had been broken all this time!)

[privoxy.git] / junkbuster-rh.spec

diff --git a/junkbuster-rh.spec b/junkbuster-rh.spec
index 9ddecfe..b05d8db 100644 (file)
--- a/junkbuster-rh.spec
+++ b/junkbuster-rh.spec
@@ -1,4 +1,4 @@
-# $Id: junkbuster-rh.spec,v 1.25 2001/12/28 01:45:36 steudten Exp $
+# $Id: junkbuster-rh.spec,v 1.28 2002/01/09 18:34:03 hal9 Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -26,6 +26,15 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: junkbuster-rh.spec,v $
+# Revision 1.28  2002/01/09 18:34:03  hal9
+# nit.
+#
+# Revision 1.27  2002/01/09 18:32:02  hal9
+# Removed RPM_OPT_FLAGS kludge.
+#
+# Revision 1.26  2002/01/09 18:21:10  hal9
+# A few minor updates.
+#
 # Revision 1.25  2001/12/28 01:45:36  steudten
 # Add paranoia check and BuildReq: gzip
 #
@@ -107,7 +116,7 @@
 Summary: The Internet Junkbuster
 Vendor: http://ijbswa.sourceforge.net
 Name: junkbuster
-Version: 2.9.10
+Version: 2.9.11
 Release: 1
 Source0: http://www.waldherr.org/junkbuster/ijbswa-%{version}.tar.gz
 Copyright: GPL
@@ -135,11 +144,11 @@ systems and multi-user networks.
 
 %build
 %configure
-make "CFLAGS=$RPM_OPT_FLAGS -Ipcre -Wall"
+make 
 strip junkbuster
 
 %pre
-/usr/sbin/useradd -d /etc/junkbuster -r junkbuster -s "/bin/false" > /dev/null 2>&1 || /bin/true
+/usr/sbin/useradd -d /etc/junkbuster -r junkbuster -s "" > /dev/null 2>&1 || /bin/true
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -150,7 +159,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} \
          ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d \
          ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d 
 
-gzip README AUTHORS junkbuster.1 || /bin/true
+gzip README AUTHORS ChangeLog junkbuster.1 || /bin/true
 install -s -m 744 junkbuster $RPM_BUILD_ROOT%{_sbindir}/junkbuster
 cp -f junkbuster.1.gz $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8.gz
 cp -f *.action $RPM_BUILD_ROOT%{ijbconf}/
@@ -176,6 +185,8 @@ cat config | \
 perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' ijb.action >\
     $RPM_BUILD_ROOT%{ijbconf}/ijb.action
 
+#%makeinstall
+
 %post
 # for upgrade from 2.0.x
 [ -f /var/log/junkbuster/junkbuster ] &&\
@@ -219,10 +230,14 @@ fi
 
 
 %changelog
+* Sun Mar 03 2002 Hal Burgiss <hal@foobox.net>
+- /bin/false for shell causes init script to fail. Reverting.
+
 * Wed Jan 09 2002 Hal Burgiss <hal@foobox.net>
 - Removed UID 73. Included user-manual and developer-manual in docs.
   Include other actions files. Default shell is now /bin/false.
-  Userdel user=junkbust.
+  Userdel user=junkbust. ChangeLog was not zipped. Removed 
+  RPM_OPT_FLAGS kludge.
 
 * Fri Dec 28 2001 Thomas Steudten <thomas@steudten.ch>
 - add paranoia check for 'rm -rf $RPM_BUILD_ROOT'