projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added tarball-src target
[privoxy.git]
/
junkbuster-rh.spec
diff --git
a/junkbuster-rh.spec
b/junkbuster-rh.spec
index
38e7e45
..
bd101af
100644
(file)
--- a/
junkbuster-rh.spec
+++ b/
junkbuster-rh.spec
@@
-1,4
+1,4
@@
-# $Id: junkbuster-rh.spec,v 1.2
2 2001/11/05 21:37:34 steudten
Exp $
+# $Id: junkbuster-rh.spec,v 1.2
4 2001/12/01 21:43:14 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,12
@@
# 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.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.22 2001/11/05 21:37:34 steudten
# Fix to include the actual version for name.
# Let the 'real' packager be included - sorry stefan.
@@
-98,7
+104,7
@@
Summary: The Internet Junkbuster
Vendor: http://ijbswa.sourceforge.net
Name: junkbuster
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-%{version}.tar.gz
Copyright: GPL
Release: 1
Source0: http://www.waldherr.org/junkbuster/ijbswa-%{version}.tar.gz
Copyright: GPL
@@
-107,7
+113,7
@@
Group: Networking/Utilities
URL: http://ijbswa.sourceforge.net/
Obsoletes: junkbuster-raw junkbuster-blank
Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service
URL: http://ijbswa.sourceforge.net/
Obsoletes: junkbuster-raw junkbuster-blank
Prereq: /usr/sbin/useradd , /sbin/chkconfig , /sbin/service
-BuildRequires: perl
+BuildRequires: perl
gzip
Conflicts: junkbuster-raw junkbuster-blank
%description
Conflicts: junkbuster-raw junkbuster-blank
%description
@@
-133,7
+139,7
@@
strip junkbuster
/usr/sbin/useradd -d /etc/junkbuster -u 73 -r junkbuster -s "" > /dev/null 2>&1 || /bin/true
%install
/usr/sbin/useradd -d /etc/junkbuster -u 73 -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 \
mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} \
${RPM_BUILD_ROOT}%{_mandir}/man8 \
${RPM_BUILD_ROOT}/var/log/junkbuster \
@@
-141,10
+147,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
+gzip README AUTHORS 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
actionsfile $RPM_BUILD_ROOT%{ijbconf}/actionsfile
+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 re_filterfile $RPM_BUILD_ROOT%{ijbconf}/re_filterfile
cp -f trust $RPM_BUILD_ROOT%{ijbconf}/trust
cp -f templates/* $RPM_BUILD_ROOT%{ijbconf}/templates/
@@
-164,8
+170,8
@@
cat config | \
# sed 's/^aclfile.*/aclfile \/etc\/junkbuster\/aclfile/g' > \
sed 's/^logdir.*/logdir \/var\/log\/junkbuster/g' > \
$RPM_BUILD_ROOT%{ijbconf}/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
%post
# for upgrade from 2.0.x
@@
-190,7
+196,7
@@
fi
#fi
%clean
#fi
%clean
-rm -rf $RPM_BUILD_ROOT
+
[ "$RPM_BUILD_ROOT" != "/" ] &&
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%files
%defattr(-,root,root)
@@
-207,6
+213,13
@@
rm -rf $RPM_BUILD_ROOT
%changelog
%changelog
+* 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
* Tue Nov 6 2001 Thomas Steudten <thomas@steudten.ch>
- Compress manpage
- Add more documents for installation