SPECS: privoxy.spec - BR macros for %service, adapterized

[glen]

Author: glen                         Date: Sun Mar 12 21:41:30 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR macros for %service, adapterized

---- Files affected:
SPECS:
   privoxy.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/privoxy.spec
diff -u SPECS/privoxy.spec:1.22 SPECS/privoxy.spec:1.23
--- SPECS/privoxy.spec:1.22	Tue Dec 13 21:20:29 2005
+++ SPECS/privoxy.spec	Sun Mar 12 22:41:24 2006
@@ -18,16 +18,16 @@
 BuildRequires:	lynx
 BuildRequires:	pcre-devel
 BuildRequires:	perl-base
-BuildRequires:	rpmbuild(macros) >= 1.231
-Requires:	rc-scripts
-Requires(pre):	/bin/id
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/useradd
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires:	rc-scripts
 Provides:	group(privoxy)
 Provides:	user(privoxy)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,14 +72,14 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	CONF_BASE=/etc/privoxy \
+	CONF_BASE=%{_sysconfdir}/privoxy \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
 # just GPLv2
-rm -f $RPM_BUILD_ROOT/usr/share/doc/privoxy/LICENSE
+rm -f $RPM_BUILD_ROOT%{_docdir}/privoxy/LICENSE
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -129,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2006/03/12 21:41:24  glen
+- BR macros for %service, adapterized
+
 Revision 1.22  2005/12/13 20:20:29  radek
 - release 3
 
@@ -159,7 +162,7 @@
 - added privoxy.init and privoxy.logrotate, rel.2
 
 Revision 1.15  2005/08/09 22:18:00  freetz
-- 3.0.3, %%service stuff, small cleanup
+- 3.0.3, %service stuff, small cleanup
 
 Revision 1.14  2005/05/20 18:12:59  darekr
 - killed setting perms in %install
@@ -181,7 +184,7 @@
 - -r not necessary
 
 Revision 1.8  2004/08/25 22:47:52  ankry
-- use %%userremove/%%groupremove, fix UID/GID
+- use %userremove/%groupremove, fix UID/GID
 
 Revision 1.7  2003/12/19 18:35:31  eothane
 - changed dl.sf.net to dl.sourceforge.net (SourceN:'s)
================================================================

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