SPECS: privoxy.spec - 3.0.3, %%service stuff, small cleanup

[freetz]

Author: freetz                       Date: Tue Aug  9 22:18:06 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 3.0.3, %%service stuff, small cleanup

---- Files affected:
SPECS:
   privoxy.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/privoxy.spec
diff -u SPECS/privoxy.spec:1.14 SPECS/privoxy.spec:1.15
--- SPECS/privoxy.spec:1.14	Fri May 20 20:12:59 2005
+++ SPECS/privoxy.spec	Wed Aug 10 00:18:00 2005
@@ -1,23 +1,23 @@
 # $Revision$, $Date$
 
-%define oldname junkbuster
-%define privoxyconf %{_sysconfdir}/%{name}
+%define		oldname junkbuster
+%define		privoxyconf %{_sysconfdir}/%{name}
 
 Summary:	Privoxy - privacy enhancing proxy
 Summary(pl):	Privoxy - proxy rozszerzające prywatność
 Name:		privoxy
-Version:	3.0.0
+Version:	3.0.3
 Release:	1
 License:	GPL
-Source0:	http://dl.sourceforge.net/ijbswa/%{name}-%{version}.tar.gz
-# Source0-md5:	152e21d4fb57b79da33559ba6dd1dd74
+Source0:	http://dl.sourceforge.net/ijbswa/%{name}-%{version}-2-stable.src.tar.gz
+# Source0-md5:	d7f6c2fcb926e6110659de6e866b21e4
 Group:		Networking/Daemons
 URL:		http://www.privoxy.org/
 BuildRequires:	autoconf
 BuildRequires:	libtool
 BuildRequires:	lynx
 BuildRequires:	perl-base
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.231
 PreReq:		rc-scripts
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
@@ -56,7 +56,8 @@
 Privoxy jest oparte na Internet Junkbusterze.
 
 %prep
-%setup -q -c
+%setup -qcT
+tar xf %{SOURCE0} --strip-components=1
 
 %build
 %{__autoheader}
@@ -118,11 +119,6 @@
 	perl -pe 's/{-no-cookies}/{-no-cookies}\n\.redhat.com/' default.action >\
 		$RPM_BUILD_ROOT%{privoxyconf}/default.action
 
-
-## Macros are expanded even on commentaries. So, we have to use %%
-## -- morcego
-#%%makeinstall
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -141,19 +137,11 @@
 	chown -R %{name}:%{name} %{privoxyconf} 2>/dev/null ||: ;
 }
 /sbin/chkconfig --add privoxy
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart
-fi
-#if [ "$1" = "1" ]; then
-#	/sbin/service %{name} condrestart > /dev/null 2>&1 ||:
-#fi
+%service privoxy restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop 1>&2
-	fi
-#	/sbin/service %{name} stop > /dev/null 2>&1 ||:
+	%service -q privoxy stop
 	/sbin/chkconfig --del privoxy
 fi
 
@@ -170,7 +158,7 @@
 %doc doc/webserver/developer-manual
 %doc doc/webserver/user-manual
 %doc doc/webserver/faq
-%doc doc/webserver/p_doc.css doc/webserver/p_web.css doc/webserver/privoxy-index.html
+%doc doc/webserver/*.css doc/webserver/privoxy-index.html
 %doc doc/webserver/images
 %doc doc/webserver/man-page
 
@@ -238,6 +226,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/08/09 22:18:00  freetz
+- 3.0.3, %%service stuff, small cleanup
+
 Revision 1.14  2005/05/20 18:12:59  darekr
 - killed setting perms in %install
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/privoxy.spec?r1=1.14&r2=1.15&f=u