From 541051f007003c8e7f86c51c560e87f3bda1dc9c Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@fedoraproject.org>
Date: Mar 25 2010 13:48:44 +0000
Subject: - add chkconfig header to init script (#576641)

- fix patch to config files (#576642)

---

diff --git a/privoxy-3.0.16-chkconfig.patch b/privoxy-3.0.16-chkconfig.patch
new file mode 100644
index 0000000..74c9939
--- /dev/null
+++ b/privoxy-3.0.16-chkconfig.patch
@@ -0,0 +1,19 @@
+diff -up privoxy-3.0.16-stable/privoxy-generic.init.chkconfig privoxy-3.0.16-stable/privoxy-generic.init
+--- privoxy-3.0.16-stable/privoxy-generic.init.chkconfig	2010-03-25 14:33:47.000000000 +0100
++++ privoxy-3.0.16-stable/privoxy-generic.init	2010-03-25 14:34:45.000000000 +0100
+@@ -1,5 +1,15 @@
+ #!/bin/sh 
+ # 
++#
++# This is file /etc/rc.d/init.d/privoxy and was put here
++# by the privoxy rpm
++#
++# chkconfig: - 84 09
++#
++# description: Web proxy with advanced filtering capabilities \
++#              such as filtering web page content, managing \
++#              cookies and removing ads
++#
+ #  ********************************************************************
+ # 
+ #  File        :  $Source: /home/fedora/jkeating/pkgs/rpms/privoxy/devel/privoxy-3.0.16-chkconfig.patch,v $
diff --git a/privoxy-3.0.16-configdir.patch b/privoxy-3.0.16-configdir.patch
new file mode 100644
index 0000000..790b4ba
--- /dev/null
+++ b/privoxy-3.0.16-configdir.patch
@@ -0,0 +1,18 @@
+diff -up privoxy-3.0.16-stable/privoxy-generic.init.configdir privoxy-3.0.16-stable/privoxy-generic.init
+--- privoxy-3.0.16-stable/privoxy-generic.init.configdir	2010-03-25 14:41:09.000000000 +0100
++++ privoxy-3.0.16-stable/privoxy-generic.init	2010-03-25 14:42:47.000000000 +0100
+@@ -56,12 +56,12 @@
+ # logfile is writable by $P_USER (logfile is defined in config), and that 
+ # there is suitable write access for $P_PIDFILE.
+ 
+-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/xpg4/bin:/usr/bin:/sbin:/bin
++PATH=/usr/bin:/bin:/sbin:/usr/sbin
+ P_NAME=Privoxy
+ # Path to executable.
+ P_DAEMON=privoxy
+ # Full path to location of Privoxy config file. 
+-P_CONF_FILE=/usr/local/etc/privoxy/config
++P_CONF_FILE=/etc/privoxy/config
+ # Full path to PID file location. Location must be writable by 
+ # whoever runs this script and by Privoxy itself.
+ P_PIDFILE=/var/run/privoxy.pid
diff --git a/privoxy.spec b/privoxy.spec
index 876b8d1..c7a0bd2 100644
--- a/privoxy.spec
+++ b/privoxy.spec
@@ -6,10 +6,12 @@
 
 Name: privoxy
 Version: 3.0.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Privacy enhancing proxy
 License: GPLv2+
 Source0: http://downloads.sourceforge.net/ijbswa/%{name}-%{version}-%{beta_or_stable}-src.tar.gz
+Patch0:  privoxy-3.0.16-chkconfig.patch
+Patch1:  privoxy-3.0.16-configdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group: System Environment/Daemons
 URL: http://www.privoxy.org/
@@ -31,6 +33,8 @@ Privoxy is based on the Internet Junkbuster.
 
 %prep
 %setup -q -n %{name}-%{version}-%{beta_or_stable}
+%patch0 -p1
+%patch1 -p1
 
 %build
 rm -rf autom4te.cache
@@ -112,6 +116,10 @@ fi
 #doc/source/developer-manual doc/source/faq doc/source/user-manual
 
 %changelog
+* Thu Mar 25 2010 Karsten Hopp <karsten@redhat.com> 3.0.16-2
+- add chkconfig header to init script (#576641)
+- fix patch to config files (#576642)
+
 * Tue Mar 23 2010 Karsten Hopp <karsten@redhat.com> 3.0.16-1
 - update to 3.0.16