X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy-suse.spec;h=81bb6e4d189ce8ed4afa9c5b685a05b55532f2a7;hp=918a15166c4886bc9dba0e6597e04157f500b7ec;hb=648433c267ce27acb4cf6192716264e4f53286c6;hpb=0b2da81ed547251a93b0b9ee9ee4fdec0ebd7a83 diff --git a/privoxy-suse.spec b/privoxy-suse.spec index 918a1516..81bb6e4d 100644 --- a/privoxy-suse.spec +++ b/privoxy-suse.spec @@ -1,7 +1,7 @@ -# $Id: privoxy-suse.spec,v 1.4 2002/03/24 12:56:21 swa Exp $ +# $Id: privoxy-suse.spec,v 1.27 2006/11/18 14:37:12 fabiankeil Exp $ # -# Written by and Copyright (C) 2001 the SourceForge -# PRIVOXY team. http://ijbswa.sourceforge.net +# Written by and Copyright (C) 2001-2006 the SourceForge +# Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and @@ -16,7 +16,7 @@ # This program is distributed in the hope that it will # be useful, but WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public +# PARTICULAR PURPOSE. See the GNU General Public # License for more details. # # The GNU General Public License should be included with @@ -27,48 +27,45 @@ # # do not set to %{name} -%define ijbconf %{_sysconfdir}/privoxy +%define privoxyconf %{_sysconfdir}/privoxy +%define privoxy_uid 73 +%define privoxy_gid 73 + Summary: Privoxy - privacy enhancing proxy -Vendor: http://ijbswa.sourceforge.net +Vendor: Privoxy.Org Name: privoxy-suse Distribution: defineme -Version: 2.9.13 +Version: 3.0.8 Release: 1 -Source: http://www.waldherr.org/%{name}/privoxy-%{version}.tar.gz +# Needs makefile change: Source: http://prdownloads.sourceforge.net/ijbswa/privoxy-%{version}-%{status}-src.tar.gz +Source: http://prdownloads.sourceforge.net/ijbswa/privoxy-%{version}.tar.gz # not sure if this works BuildRoot: %{_tmppath}/%{name}-%{version}-root -Packager: Stefan Waldherr -Copyright: GPL +Packager: http://www.privoxy.org/ +License: GPL Group: Networking/Utilities -URL: http://ijbswa.sourceforge.net/ -Provides: privoxy -Obsoletes: privoxy +URL: http://www.privoxy.org/ Autoreqprov: on -BuildRequires: perl gzip docbktls libtool -Conflicts: junkbuster-raw junkbuster-blank junkbuster +BuildRequires: perl gzip libtool autoconf +Conflicts: junkbuster-raw junkbuster-blank junkbuster-suse junkbuster privoxy # # ----------------------------------------------------------------------------- # %description Privoxy is a web proxy with advanced filtering capabilities for -protecting privacy, filtering web page content, managing cookies, +protecting privacy, modifying web page data, managing cookies, controlling access, and removing ads, banners, pop-ups and other obnoxious Internet junk. Privoxy has a very flexible configuration and -can be customized to suit individual needs and tastes. Internet -Privoxy has application for both stand-alone systems and multi-user -networks. +can be customized to suit individual needs and tastes. Privoxy has +application for both stand-alone systems and multi-user networks. -Privoxy is based on the code of the Internet Junkbuster. Junkbuster -was originally written by JunkBusters Corporation, and was released as -free open-source software under the GNU GPL. Stefan Waldherr made many -improvements, and started the SourceForge project to continue -development. Several other developers are now contributing. +Privoxy is based on the Internet Junkbuster. Authors: -------- - http://ijbswa.sourceforge.net + http://www.privoxy.org/ SuSE series: n @@ -84,9 +81,9 @@ SuSE series: n %build autoheader autoconf -./configure +./configure --disable-dynamic-pcre make -make dok + ## Explicitily stripping is not recomended. ## This is handled altomaticaly by RPM, and can couse troubles if @@ -101,16 +98,16 @@ make dok mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} \ ${RPM_BUILD_ROOT}%{_mandir}/man8 \ ${RPM_BUILD_ROOT}/var/log/privoxy \ - ${RPM_BUILD_ROOT}%{ijbconf}/templates \ + ${RPM_BUILD_ROOT}%{privoxyconf}/templates \ ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d \ ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d -gzip README AUTHORS ChangeLog privoxy.1 || /bin/true +gzip README AUTHORS ChangeLog privoxy.1 LICENSE || /bin/true install -s -m 744 privoxy $RPM_BUILD_ROOT%{_sbindir}/privoxy cp -f privoxy.1.gz $RPM_BUILD_ROOT%{_mandir}/man8/privoxy.8.gz -cp -f *.action $RPM_BUILD_ROOT%{ijbconf}/ -cp -f default.filter $RPM_BUILD_ROOT%{ijbconf}/default.filter -cp -f trust $RPM_BUILD_ROOT%{ijbconf}/trust -cp -f templates/* $RPM_BUILD_ROOT%{ijbconf}/templates/ +cp -f *.action $RPM_BUILD_ROOT%{privoxyconf}/ +cp -f default.filter $RPM_BUILD_ROOT%{privoxyconf}/default.filter +cp -f trust $RPM_BUILD_ROOT%{privoxyconf}/trust +cp -f templates/* $RPM_BUILD_ROOT%{privoxyconf}/templates/ cp -f privoxy.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/privoxy install -m 755 privoxy.init.suse $RPM_BUILD_ROOT%{_sysconfdir}/init.d/privoxy install -m 711 -d $RPM_BUILD_ROOT/var/log/privoxy @@ -127,7 +124,7 @@ cat config | \ # sed 's/^forward.*/forward \/etc\/privoxy\/forward/g' | \ # sed 's/^aclfile.*/aclfile \/etc\/privoxy\/aclfile/g' > \ sed 's/^logdir.*/logdir \/var\/log\/privoxy/g' > \ - $RPM_BUILD_ROOT%{ijbconf}/config + $RPM_BUILD_ROOT%{privoxyconf}/config # # ----------------------------------------------------------------------------- @@ -142,11 +139,11 @@ id privoxy > /dev/null 2>&1 if [ $? -eq 1 ]; then id junkbust > /dev/null 2>&1 if [ $? -eq 0 ]; then - /usr/sbin/usermod -l privoxy -d %{_sysconfdir}/privoxy -s "" junkbust > /dev/null 2>&1 + /usr/sbin/usermod -u %{privoxy_uid} -g %{privoxy_gid} -l privoxy -d %{_sysconfdir}/privoxy -s "" junkbust > /dev/null 2>&1 else # -r does not work on suse. - /usr/sbin/groupadd privoxy - /usr/sbin/useradd -d %{_sysconfdir}/privoxy -g privoxy -s "" privoxy > /dev/null 2>&1 + /usr/sbin/groupadd -g %{privoxy_gid} privoxy + /usr/sbin/useradd -u %{privoxy_uid} -d %{_sysconfdir}/privoxy -g privoxy -s "" privoxy > /dev/null 2>&1 fi fi @@ -196,15 +193,18 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true # %files %defattr(-,root,root) -%doc README.gz AUTHORS.gz ChangeLog.gz -%doc doc/webserver/developer-manual doc/webserver/user-manual +%doc README.gz AUTHORS.gz ChangeLog.gz LICENSE.gz +%doc doc/webserver/developer-manual %doc doc/webserver/user-manual %doc doc/webserver/faq -%doc doc/webserver/ijb_docs.css -#%doc privoxy.weekly privoxy.monthly AUTHORS -%dir %{ijbconf} -%config %{ijbconf}/* -%attr(0744,privoxy,privoxy) %dir /var/log/privoxy +%doc doc/webserver/p_doc.css +%doc doc/webserver/privoxy-index.html +%doc doc/webserver/images +%doc doc/webserver/man-page + +%dir %{privoxyconf} +%config %{privoxyconf}/* +%attr(0740,privoxy,privoxy) %dir /var/log/privoxy %config %{_sysconfdir}/logrotate.d/privoxy %attr(0755,root,root)/usr/sbin/privoxy %{_mandir}/man8/* @@ -215,6 +215,74 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true # ----------------------------------------------------------------------------- # %changelog +* Wed Sep 20 2006 Hal Burgiss +- Bump version for 3.0.5. + +* Fri Sep 08 2006 Hal Burgiss +- Bump version for 3.0.4. + +* Wed Mar 26 2003 Andreas Oesterhelt +- Bump version for 3.0.2. + +* Wed Mar 19 2003 Hal Burgiss +- Bump version for 3.0.1. + +* Tue Aug 25 2002 Hal Burgiss +- Bump version for 3.0.0 :) + +* Tue Aug 06 2002 Hal Burgiss +- Reset version for 2.9.18. + +* Wed Jul 30 2002 Hal Burgiss +- Reset version for 2.9.17. + +* Sat Jul 27 2002 Hal Burgiss +- Reset version and release for 2.9.16. + +* Mon May 27 2002 Hal Burgiss ++ privoxy-2.9.15-1 +- Index.html is now privoxy-index.html for doc usage. + +* Mon May 27 2002 Hal Burgiss ++ privoxy-2.9.15-1 +- Index.html is now privoxy-index.html for doc usage. + +* Sat May 25 2002 Hal Burgiss ++ privoxy-2.9.15-1 +- Add html man page so index.html does not 404. + +* Fri May 24 2002 Hal Burgiss ++ privoxy-2.9.15-1 +- Add doc/images directory. + +* Fri May 03 2002 Rodrigo Barbosa ++ privoxy-suse-2.9.15-1 +- Version bump + +* Fri Apr 26 2002 Rodrigo Barbosa ++ privoxy-suse-2.9.14-3 +- Changing Vendor to Privoxy.Org + +* Mon Apr 22 2002 Rodrigo Barbosa ++ privoxy-suse-2.9.14-2 +- Bumping release to reflect the new value on configure.in +- Taking the oportunity to change the header Copyright to License. The + Copyright headers is deprecated, and after all, GPL is a license, not a + Copyright + +* Mon Apr 08 2002 Hal Burgiss ++ privoxy-2.9.13-4 +- Add LICENSE.gz, p_web.css, and index.html. Add autoconf +- to Buildrequires. + +* Wed Mar 27 2002 Hal Burgiss ++ privoxy-2.9.13-3 +- Doc css has changed names. + +* Tue Mar 25 2002 Hal Burgiss ++ privoxy-2.9.13-3 +- Minor fix to description. + * Sun Mar 24 2002 Hal Burgiss - added faq to docs. @@ -287,6 +355,104 @@ id privoxy > /dev/null 2>&1 && /usr/sbin/userdel privoxy || /bin/true - new package: version 2.0 # $Log: privoxy-suse.spec,v $ +# Revision 1.27 2006/11/18 14:37:12 fabiankeil +# Bump version to 3.0.6. +# +# Revision 1.26 2006/09/20 23:51:26 hal9 +# Bump versions to 3.0.5 +# +# Revision 1.25 2006/09/09 00:35:10 hal9 +# Bumped versions to 3.0.4. Both files should be checked further. +# +# Revision 1.24 2006/07/18 14:48:47 david__schmidt +# Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) +# with what was really the latest development (the v_3_0_branch branch) +# +# Revision 1.20.2.10 2004/01/30 17:09:29 oes +# Bumped version for 3.0.3 +# +# Revision 1.20.2.9 2003/03/26 00:24:58 oes +# Bump version for 3.0.2 +# +# Revision 1.20.2.8 2003/03/20 03:27:11 hal9 +# Bump version for 3.0.1 pending release. +# +# Revision 1.20.2.7 2002/08/25 23:36:03 hal9 +# Bump version for 3.0.0. +# +# Revision 1.20.2.6 2002/08/10 11:28:50 oes +# Bumped version +# +# Revision 1.20.2.5 2002/08/07 01:08:49 hal9 +# Bumped version to 2.9.18. +# +# Revision 1.20.2.4 2002/07/30 21:51:19 hal9 +# Bump version to 2.9.17. +# +# Revision 1.20.2.3 2002/07/27 15:47:10 hal9 +# Reset version and release for 2.9.16. +# +# Revision 1.20.2.2 2002/05/28 02:39:38 hal9 +# Replace index.html with privoxy-index.html for docs. +# +# Revision 1.20.2.1 2002/05/26 17:20:23 hal9 +# Add images to doc dirs. +# +# Revision 1.20 2002/05/25 02:08:23 hal9 +# Add doc/images directory. +# Redhat: alphabetized list of templates (and I think added one in the process) +# +# Revision 1.19 2002/05/03 17:14:36 morcego +# *.spec: Version bump to 2.9.15 +# -rh.spec: noreplace for %%{privoxyconf}/config +# Will interrupt the build if versions from configure.in and +# specfile do not match +# +# Revision 1.18 2002/04/27 20:26:59 swa +# uid, gui 73 incorporated +# +# Revision 1.17 2002/04/26 15:51:05 morcego +# Changing Vendor value to Privoxy.Org +# +# Revision 1.16 2002/04/22 16:32:31 morcego +# configure.in, *.spec: Bumping release to 2 (2.9.14-2) +# -rh.spec: uid and gid are now macros +# -suse.spec: Changing the header Copyright to License (Copyright is +# deprecable) +# +# Revision 1.15 2002/04/16 18:49:07 oes +# Build with static built-in pcre +# +# Revision 1.14 2002/04/11 17:57:40 oes +# Fixed(?) Conflicts: Provides: Obsoletes: +# +# Revision 1.13 2002/04/11 10:09:20 oes +# Version 2.9.14 +# +# Revision 1.12 2002/04/09 13:29:43 swa +# build suse and gen-dist with html docs. do not generate docs while building rpm +# +# Revision 1.11 2002/04/09 03:12:37 hal9 +# Add LICENSE, p_web.css and index.html. Add autoconf to buildrequires. +# +# Revision 1.10 2002/04/08 20:24:13 swa +# fixed JB spelling +# +# Revision 1.9 2002/03/30 09:01:52 swa +# new release +# +# Revision 1.8 2002/03/27 23:46:41 hal9 +# ijb_docs.css to p_doc.css +# +# Revision 1.7 2002/03/27 00:49:39 hal9 +# Minor fix to description. +# +# Revision 1.6 2002/03/26 22:29:55 swa +# we have a new homepage! +# +# Revision 1.5 2002/03/25 03:10:50 hal9 +# Added faq to docs. +# # Revision 1.4 2002/03/24 12:56:21 swa # name change related issues. #