-# $Id: privoxy-suse.spec,v 1.11 2002/04/09 03:12:37 hal9 Exp $
+# $Id: privoxy-suse.spec,v 1.22 2002/09/03 23:42:21 hal9 Exp $
#
-# Written by and Copyright (C) 2001 the SourceForge
+# Written by and Copyright (C) 2001,2002 the SourceForge
# Privoxy team. http://www.privoxy.org/
#
# Based on the Internet Junkbuster originally written
# 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
#
# 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://www.privoxy.org
+Vendor: Privoxy.Org
Name: privoxy-suse
Distribution: defineme
-Version: 2.9.13
-Release: 3
-Source: http://www.waldherr.org/%{name}/privoxy-%{version}.tar.gz
+Version: 3.0.0
+Release: 1
+# 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 <stefan@waldherr.org>
-Copyright: GPL
+License: GPL
Group: Networking/Utilities
URL: http://www.privoxy.org/
-Provides: privoxy
-Obsoletes: privoxy
Autoreqprov: on
BuildRequires: perl gzip libtool autoconf
-Conflicts: junkbuster-raw junkbuster-blank junkbuster
+Conflicts: junkbuster-raw junkbuster-blank junkbuster-suse junkbuster privoxy
#
# -----------------------------------------------------------------------------
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:
--------
%build
autoheader
autoconf
-./configure
+./configure --disable-dynamic-pcre
make
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 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
# 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
#
# -----------------------------------------------------------------------------
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
%doc doc/webserver/faq
%doc doc/webserver/p_doc.css
%doc doc/webserver/p_web.css
-%doc doc/webserver/index.html
+%doc doc/webserver/privoxy-index.html
+%doc doc/webserver/images
#%doc privoxy.weekly privoxy.monthly AUTHORS
-%dir %{ijbconf}
-%config %{ijbconf}/*
+%dir %{privoxyconf}
+#%config %{privoxyconf}/*
+# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
+# We should not use wildchars here. This could mask missing files problems
+# -- morcego
+# WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING ! WARNING !
+%config(noreplace) %{privoxyconf}/config
+%config %{privoxyconf}/standard.action
+%config(noreplace) %{privoxyconf}/user.action
+%config %{privoxyconf}/default.action
+%config %{privoxyconf}/default.filter
+%config %{privoxyconf}/trust
+
+# Please keep these alphabetized so its easier to find one that
+# is not included.
+%config %{privoxyconf}/templates/blocked
+%config %{privoxyconf}/templates/cgi-error-404
+%config %{privoxyconf}/templates/cgi-error-bad-param
+%config %{privoxyconf}/templates/cgi-error-disabled
+%config %{privoxyconf}/templates/cgi-error-file
+%config %{privoxyconf}/templates/cgi-error-file-read-only
+%config %{privoxyconf}/templates/cgi-error-modified
+%config %{privoxyconf}/templates/cgi-error-parse
+%config %{privoxyconf}/templates/cgi-style.css
+%config %{privoxyconf}/templates/connect-failed
+%config %{privoxyconf}/templates/default
+%config %{privoxyconf}/templates/edit-actions-add-url-form
+%config %{privoxyconf}/templates/edit-actions-for-url
+%config %{privoxyconf}/templates/edit-actions-for-url-filter
+%config %{privoxyconf}/templates/edit-actions-list
+%config %{privoxyconf}/templates/edit-actions-list-button
+%config %{privoxyconf}/templates/edit-actions-list-section
+%config %{privoxyconf}/templates/edit-actions-list-url
+%config %{privoxyconf}/templates/edit-actions-remove-url-form
+%config %{privoxyconf}/templates/edit-actions-url-form
+%config %{privoxyconf}/templates/mod-local-help
+%config %{privoxyconf}/templates/mod-support-and-service
+%config %{privoxyconf}/templates/mod-title
+%config %{privoxyconf}/templates/mod-unstable-warning
+%config %{privoxyconf}/templates/no-such-domain
+%config %{privoxyconf}/templates/show-request
+%config %{privoxyconf}/templates/show-status
+%config %{privoxyconf}/templates/show-status-file
+%config %{privoxyconf}/templates/show-url-info
+%config %{privoxyconf}/templates/show-version
+%config %{privoxyconf}/templates/toggle
+%config %{privoxyconf}/templates/toggle-mini
+%config %{privoxyconf}/templates/untrusted
+
%attr(0744,privoxy,privoxy) %dir /var/log/privoxy
%config %{_sysconfdir}/logrotate.d/privoxy
%attr(0755,root,root)/usr/sbin/privoxy
# -----------------------------------------------------------------------------
#
%changelog
+* Thu Sep 05 2002 Hal Burgiss <hal@foobox.net>
+- Sync changes with 3.0 branch.
+
+* Tue Sep 03 2002 Hal Burgiss <hal@foobox.net>
++ privoxy-3.1.1-1
+- Explicitly list %%config files, and set noreplace flag for config and
+user.action. Note: no way I can test this change! Bump version while here.
+
+* Mon May 27 2002 Hal Burgiss <hal@foobox.net>
++ privoxy-2.9.15-1
+- Index.html is now privoxy-index.html.
+
+* Fri May 24 2002 Hal Burgiss <hal@foobox.net>
++ privoxy-2.9.15-1
+- Add doc/images directory.
+
+* Fri May 03 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
++ privoxy-suse-2.9.15-1
+- Version bump
+
+* Fri Apr 26 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
++ privoxy-suse-2.9.14-3
+- Changing Vendor to Privoxy.Org
+
+* Mon Apr 22 2002 Rodrigo Barbosa <rodrigob@tisbrasil.com.br>
++ 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 <hal@foobox.net>
+ privoxy-2.9.13-4
- Add LICENSE.gz, p_web.css, and index.html. Add autoconf
- new package: version 2.0
# $Log: privoxy-suse.spec,v $
+# Revision 1.22 2002/09/03 23:42:21 hal9
+# Explicitly list all %config files, like RH spec. Set noreplace flag for config
+# and user.action (only). Bump version. Note: I have no way to test this change,
+# but am aiming for consistency among spec files.
+#
+# Revision 1.21 2002/05/28 03:56:59 hal9
+# Index.html re-vamped as privoxy-index.html for docs.
+#
+# 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.
#