- release 4: Prereq: /sbin/chkconfig

Changed files:
    squid.spec -> 1.70

diff --git a/squid.spec b/squid.spec
index 696673d7c2b37ffe824299b960717b4b3084635c..9e53214597c97739e225f39b7b67fc68ae573c4a 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -2,7 +2,7 @@ Summary:        SQUID Internet Object Cache
 Summary(pl):   Uniwersalny proxy-cache server
 Name:          squid
 Version:       2.4.STABLE2
-Release:       3
+Release:       4
 Epoch:         6
 License:       GPL
 Group:         Networking/Daemons
@@ -23,6 +23,7 @@ Patch4:               %{name}-domainmatch.patch
 Patch5:                %{name}-ftp-bugfix.patch
 BuildRequires: autoconf
 Prereq:                rc-scripts >= 0.2.0
+Prereq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _libexecdir     %{_libdir}/%{name}
@@ -74,7 +75,7 @@ various informations about Squid via WWW.
 
 %description -l pl cachemgr
 Cachemgr.cgi jest skryptem CGI, który pozwala administratorowi
-zapoznaæ siê z informacjami o pracy Squid'a poprzez WWW.
+zapoznaæ siê z informacjami o pracy Squida poprzez WWW.
 
 %prep
 %setup -q -a 1 -a 4
@@ -151,7 +152,7 @@ done
 cd ..
 
 cd $RPM_BUILD_ROOT/etc/squid
-cp squid.conf{,.default}
+cp -f squid.conf{,.default}
 patch -p0 < %{SOURCE5}
 cd -
 
@@ -169,6 +170,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/R*
 gzip -9nf CONTRIBUTORS COPYRIGHT CREDITS README ChangeLog QUICKSTART \
        TODO
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %pre
 grep -q squid /etc/group || (
     /usr/sbin/groupadd -g 91 -r -f squid 1>&2 || :
@@ -218,9 +222,6 @@ if [ "$1" = "0" ]; then
        rm -f %{_datadir}/squid/errors
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
 %doc faq *.gz doc/*