X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=junkbuster-rh.spec;h=0526e63bbec1eff8ee0bd343484ce7330b7f991f;hb=be86475cd21c5b147db497e4d4213388b673e668;hp=b3da1e1762333b340877e136e4c7030488bd3577;hpb=3fee6d0fa7176cc379b6554285edeb200fe7b34e;p=privoxy.git

diff --git a/junkbuster-rh.spec b/junkbuster-rh.spec
index b3da1e17..0526e63b 100644
--- a/junkbuster-rh.spec
+++ b/junkbuster-rh.spec
@@ -1,4 +1,4 @@
-# $Id: junkbuster-rh.spec,v 1.20 2001/10/24 15:45:49 hal9 Exp $
+# $Id: junkbuster-rh.spec,v 1.23 2001/11/06 12:09:03 steudten Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # IJBSWA team.  http://ijbswa.sourceforge.net
@@ -26,6 +26,18 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: junkbuster-rh.spec,v $
+# Revision 1.23  2001/11/06 12:09:03  steudten
+# Compress doc files. Install README and AUTHORS at last as document.
+#
+# Revision 1.22  2001/11/05 21:37:34  steudten
+# Fix to include the actual version for name.
+# Let the 'real' packager be included - sorry stefan.
+#
+# Revision 1.21  2001/10/31 19:27:27  swa
+# consistent description. new name for suse since
+# we had troubles with rpms of identical names
+# on the webserver.
+#
 # Revision 1.20  2001/10/24 15:45:49  hal9
 # To keep Thomas happy (aka correcting my  mistakes)
 #
@@ -89,14 +101,13 @@
 Summary: The Internet Junkbuster
 Vendor: http://ijbswa.sourceforge.net
 Name: junkbuster
-Version: 2.9.9
+Version: 2.9.10
 Release: 1
-Source0: http://www.waldherr.org/junkbuster/ijbswa.tar.gz
+Source0: http://www.waldherr.org/junkbuster/ijbswa-%{version}.tar.gz
 Copyright: GPL
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Group: Networking/Utilities
 URL: http://ijbswa.sourceforge.net/
-Packager: Stefan Waldherr <stefan@waldherr.org>
 Obsoletes: junkbuster-raw junkbuster-blank
 Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service 
 BuildRequires: perl
@@ -133,16 +144,16 @@ 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
 install -s -m 744 junkbuster $RPM_BUILD_ROOT%{_sbindir}/junkbuster
-# Out temporarily
-cp -f junkbuster.1 $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8
-cp -f actionsfile $RPM_BUILD_ROOT%{ijbconf}/actionsfile
+cp -f junkbuster.1.gz $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8.gz
+cp -f ijb.action $RPM_BUILD_ROOT%{ijbconf}/ijb.action
 cp -f re_filterfile $RPM_BUILD_ROOT%{ijbconf}/re_filterfile
 cp -f trust $RPM_BUILD_ROOT%{ijbconf}/trust
 cp -f templates/*  $RPM_BUILD_ROOT%{ijbconf}/templates/
 cp -f junkbuster.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/junkbuster
 install -m 755 junkbuster.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/junkbuster
-install -m 744 -d $RPM_BUILD_ROOT/var/log/junkbuster
+install -m 711 -d $RPM_BUILD_ROOT/var/log/junkbuster
 
 # verify all file locations, etc. in the config file
 # don't start with ^ or commented lines are not replaced
@@ -156,8 +167,8 @@ cat config | \
 #    sed 's/^aclfile.*/aclfile \/etc\/junkbuster\/aclfile/g' > \
     sed 's/^logdir.*/logdir \/var\/log\/junkbuster/g' > \
     $RPM_BUILD_ROOT%{ijbconf}/config
-perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' actionsfile >\
-    $RPM_BUILD_ROOT%{ijbconf}/actionsfile
+perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' ijb.action >\
+    $RPM_BUILD_ROOT%{ijbconf}/ijb.action
 
 %post
 # for upgrade from 2.0.x
@@ -186,8 +197,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc doc/webserver/developer-manual doc/webserver/user-manual README 
-%doc junkbuster.weekly junkbuster.monthly AUTHORS
+%doc README.gz AUTHORS.gz 
+#%doc doc/webserver/developer-manual doc/webserver/user-manual README 
+#%doc junkbuster.weekly junkbuster.monthly AUTHORS
 %dir %{ijbconf}
 %config %{ijbconf}/*
 %attr(0744,junkbuster,junkbuster) %dir /var/log/junkbuster
@@ -198,6 +210,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec  1 2001 Hal Burgiss <hal@foobox.net>
+- actionsfile is now ijb.action.
+
+* Tue Nov  6 2001 Thomas Steudten <thomas@steudten.ch>
+- Compress manpage
+- Add more documents for installation
+- Add version string to name and source
+
 * Wed Oct 24 2001 Hal Burigss <hal@foobox.net>
 - Back to user 'junkbuster' and fix configure macro.