-# $Id: junkbuster-rh.spec,v 1.11 2001/07/03 11:00:25 sarantis Exp $
+# $Id: junkbuster-rh.spec,v 1.13 2001/09/10 17:44:43 swa 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.13 2001/09/10 17:44:43 swa
+# integrate three pieces of documentation. needs work.
+# will not build cleanly under redhat.
+#
+# Revision 1.12 2001/09/10 16:25:04 swa
+# copy all templates. version updated.
+#
# Revision 1.11 2001/07/03 11:00:25 sarantis
# replaced permissionsfile with actionsfile
#
%setup -c -n ijbswa
%build
+OPT_FLAGS="$RPM_OPT_FLAGS -Ipcre -Wall"
./configure
-make
+make "CFLAGS=$OPT_FLAGS"
strip junkbuster
%pre
-/usr/sbin/useradd -d /etc/junkbuster -u 73 -r junkbust > /dev/null 2>&1 || /bin/true
+/usr/sbin/useradd -d /etc/junkbuster -u 73 -r junkbust -s "" > /dev/null 2>&1 || /bin/true
%install
rm -rf $RPM_BUILD_ROOT
${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
install -s -m 744 junkbuster $RPM_BUILD_ROOT%{_sbindir}/junkbuster
-cp -f junkbuster.1 $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8
+# Out temporarily
+#cp -f junkbuster.1 $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8
cp -f actionsfile $RPM_BUILD_ROOT%{ijbconf}/actionsfile
cp -f re_filterfile $RPM_BUILD_ROOT%{ijbconf}/re_filterfile
cp -f trust $RPM_BUILD_ROOT%{ijbconf}/trust
if [ "$1" = "1" ]; then
/sbin/chkconfig --add junkbuster
fi
+# for upgrade from 2.0.x
+chown junkbust:junkbust /var/log/junkbuster/* 2>/dev/null
+chown junkbust:junkbust /etc/junkbuster 2>/dev/null
+[ -f /var/log/junkbuster/junkbuster ] &&\
+ mv -f /var/log/junkbuster/junkbuster /var/log/junkbuster/logfile || true
%preun
if [ "$1" = "0" ]; then
%files
%defattr(-,root,root)
-# %doc ijbfaq.html ijbman.html README README.TOO gpl.html
+%doc doc/webserver/developer-manual doc/webserver/user-manual README
%doc junkbuster.weekly junkbuster.monthly
%dir %{ijbconf}
%config %{ijbconf}/*
%attr(0744,junkbust,junkbust) %dir /var/log/junkbuster
%config %{_sysconfdir}/logrotate.d/junkbuster
%attr(0744,junkbust,junkbust)/usr/sbin/junkbuster
-%{_mandir}/man8/*
+#temporarily out until it is updated.
+#%{_mandir}/man8/*
%config %{_sysconfdir}/rc.d/init.d/junkbuster
%changelog
+* Sun Sep 23 2001 Hal Burgiss <hal@foobox.net>
+- Change of $RPM_OPT_FLAGS handling. Added new HTML doc files.
+- Changed owner of /etc/junkbuster to shut up PAM/xauth log noise.
+
+* Thu Sep 13 2001 Hal Burgiss <hal@foobox.net>
+- Added $RPM_OPT_FLAGS support, renaming of old logfile, and
+- made sure no default shell exists for user junkbust.
* Sun Jun 3 2001 Stefan Waldherr <stefan@waldherr.org>
- rework of RPM