projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding map_block_keep() to save a few bytes in the edit-actions-list HTML.
[privoxy.git]
/
junkbuster-rh.spec
diff --git
a/junkbuster-rh.spec
b/junkbuster-rh.spec
index
bd101af
..
cd18f29
100644
(file)
--- a/
junkbuster-rh.spec
+++ b/
junkbuster-rh.spec
@@
-1,4
+1,4
@@
-# $Id: junkbuster-rh.spec,v 1.2
4 2001/12/01 21:43:14
hal9 Exp $
+# $Id: junkbuster-rh.spec,v 1.2
7 2002/01/09 18:32:02
hal9 Exp $
#
# Written by and Copyright (C) 2001 the SourceForge
# IJBSWA team. http://ijbswa.sourceforge.net
#
# 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 $
# Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# $Log: junkbuster-rh.spec,v $
+# 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.24 2001/12/01 21:43:14 hal9
# Allowed for new ijb.action file.
#
@@
-105,7
+114,7
@@
Summary: The Internet Junkbuster
Vendor: http://ijbswa.sourceforge.net
Name: junkbuster
Version: 2.9.10
Vendor: http://ijbswa.sourceforge.net
Name: junkbuster
Version: 2.9.10
-Release:
1
+Release:
2
Source0: http://www.waldherr.org/junkbuster/ijbswa-%{version}.tar.gz
Copyright: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Source0: http://www.waldherr.org/junkbuster/ijbswa-%{version}.tar.gz
Copyright: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@
-132,11
+141,11
@@
systems and multi-user networks.
%build
%configure
%build
%configure
-make
"CFLAGS=$RPM_OPT_FLAGS -Ipcre -Wall"
+make
strip junkbuster
%pre
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 "/bin/false
" > /dev/null 2>&1 || /bin/true
%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@
-147,10
+156,10
@@
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} \
${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d \
${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
${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
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
ijb.action $RPM_BUILD_ROOT%{ijbconf}/ijb.action
+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 re_filterfile $RPM_BUILD_ROOT%{ijbconf}/re_filterfile
cp -f trust $RPM_BUILD_ROOT%{ijbconf}/trust
cp -f templates/* $RPM_BUILD_ROOT%{ijbconf}/templates/
@@
-183,6
+192,8
@@
if [ "$1" = "1" ]; then
/sbin/chkconfig --add junkbuster
/sbin/service junkbuster condrestart > /dev/null 2>&1
fi
/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
%preun
if [ "$1" = "0" ]; then
@@
-200,8
+211,9
@@
fi
%files
%defattr(-,root,root)
%files
%defattr(-,root,root)
-%doc README.gz AUTHORS.gz
-#%doc doc/webserver/developer-manual doc/webserver/user-manual README
+%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}/*
#%doc junkbuster.weekly junkbuster.monthly AUTHORS
%dir %{ijbconf}
%config %{ijbconf}/*
@@
-213,6
+225,12
@@
fi
%changelog
%changelog
+* 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'
* Fri Dec 28 2001 Thomas Steudten <thomas@steudten.ch>
- add paranoia check for 'rm -rf $RPM_BUILD_ROOT'
- add gzip to 'BuildRequires'