- _defaultdocdir -> _docdir

[packages/privoxy.git] / privoxy.spec

diff --git a/privoxy.spec b/privoxy.spec
index 63e595128869fbfa18d46a8ee16ac658a9be63e1..38eaaeee746027aa17e85541657bf812c16a721e 100644 (file)
--- a/privoxy.spec
+++ b/privoxy.spec
@@ -2,7 +2,7 @@ Summary:        Privoxy - privacy enhancing proxy
 Summary(pl):   Privoxy - proxy rozszerzaj±ce prywatno¶æ
 Name:          privoxy
 Version:       3.0.3
-Release:       2.2
+Release:       5
 License:       GPL v2+
 Source0:       http://dl.sourceforge.net/ijbswa/%{name}-%{version}-2-stable.src.tar.gz
 # Source0-md5: d7f6c2fcb926e6110659de6e866b21e4
@@ -12,20 +12,21 @@ Patch0:             %{name}-DESTDIR.patch
 Group:         Networking/Daemons
 URL:           http://www.privoxy.org/
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: libtool
 BuildRequires: lynx
 BuildRequires: pcre-devel
 BuildRequires: perl-base
-BuildRequires: rpmbuild(macros) >= 1.231
-PreReq:                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)
@@ -56,8 +57,10 @@ Privoxy jest oparte na Internet Junkbusterze.
 %patch0 -p0
 
 %build
-%{__autoheader}
+%{__aclocal}
 %{__autoconf}
+%{__autoheader}
+cp -f /usr/share/automake/config.sub .
 %configure
 
 %{__make} \
@@ -68,14 +71,14 @@ Privoxy jest oparte na Internet Junkbusterze.
 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
@@ -104,17 +107,17 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/%{name}
 %{_mandir}/man1/%{name}.*
-%config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/%{name}
+%config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 
 %dir %attr(751,privoxy,privoxy) /var/log/%{name}
-%ghost %attr(640,privoxy,privoxy) %verify(not size mtime md5) /var/log/%{name}/*
+%ghost %attr(640,privoxy,privoxy) %verify(not md5 mtime size) /var/log/%{name}/*
 
 %dir %attr(751,root,privoxy) %{_sysconfdir}/%{name}
 %dir %attr(751,root,privoxy) %{_sysconfdir}/%{name}/templates
-%attr(751,root,privoxy) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/config
-%attr(751,root,privoxy) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/trust
-%attr(751,root,privoxy) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/*.*
-%attr(751,root,privoxy) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/templates/*
+%attr(640,root,privoxy) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/config
+%attr(640,root,privoxy) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/trust
+%attr(640,root,privoxy) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.*
+%attr(640,root,privoxy) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/templates/*
 
-%doc $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/*
+%doc $RPM_BUILD_ROOT%{_docdir}/%{name}/*