-# $Id: junkbuster-rh.spec,v 1.20 2001/10/24 15:45:49 hal9 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
# 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
+#
+# Revision 1.24 2001/12/01 21:43:14 hal9
+# Allowed for new ijb.action file.
+#
+# 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)
#
Summary: The Internet Junkbuster
Vendor: http://ijbswa.sourceforge.net
Name: junkbuster
-Version: 2.9.9
+Version: 2.9.11
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
+BuildRequires: perl gzip
Conflicts: junkbuster-raw junkbuster-blank
%description
%build
%configure
-make "CFLAGS=$RPM_OPT_FLAGS -Ipcre -Wall"
+make
strip junkbuster
%pre
-/usr/sbin/useradd -d /etc/junkbuster -u 73 -r junkbuster -s "" > /dev/null 2>&1 || /bin/true
+/usr/sbin/useradd -d /etc/junkbuster -r junkbuster -s "" > /dev/null 2>&1 || /bin/true
%install
-rm -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} \
${RPM_BUILD_ROOT}%{_mandir}/man8 \
${RPM_BUILD_ROOT}/var/log/junkbuster \
${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d \
${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
+gzip README AUTHORS ChangeLog junkbuster.1 || /bin/true
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 *.action $RPM_BUILD_ROOT%{ijbconf}/
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
# 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
+
+#%makeinstall
%post
# for upgrade from 2.0.x
/sbin/chkconfig --add junkbuster
/sbin/service junkbuster condrestart > /dev/null 2>&1
fi
+# 01/09/02 HB, getting rid of any user=junkbust
+grep junkbust: /etc/passwd >/dev/null && userdel junkbust || /bin/true
%preun
if [ "$1" = "0" ]; then
#fi
%clean
-rm -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && 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 ChangeLog.gz
+%doc doc/webserver/developer-manual doc/webserver/user-manual
+%doc doc/webserver/user-manual
+#%doc junkbuster.weekly junkbuster.monthly AUTHORS
%dir %{ijbconf}
%config %{ijbconf}/*
%attr(0744,junkbuster,junkbuster) %dir /var/log/junkbuster
%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. 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'
+- add gzip to 'BuildRequires'
+
+* 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.
projects / privoxy.git / blobdiff