SPECS: squid.spec - adapterized (PreReq killed)

[glen]

Author: glen                         Date: Mon Oct 31 15:12:26 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized (PreReq killed)

---- Files affected:
SPECS:
   squid.spec (1.226 -> 1.227) 

---- Diffs:

================================================================
Index: SPECS/squid.spec
diff -u SPECS/squid.spec:1.226 SPECS/squid.spec:1.227
--- SPECS/squid.spec:1.226	Mon Oct 31 16:07:22 2005
+++ SPECS/squid.spec	Mon Oct 31 16:12:20 2005
@@ -32,7 +32,7 @@
 Source6:	%{name}.logrotate
 Source7:	%{name}.pamd
 # Bug fixes from Squid home page, please include URL
-Patch0:		http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-setenv.patch
+Patch0:		http://www.squid-cache.org/Versions/v2/2.5/bugs/%{name}-2.5.STABLE12-setenv.patch
 # Other patches:
 Patch100:	http://www.sed.pl/~mrk/qos/%{name}_hit_miss_mark.patch
 Patch101:	%{name}-fhs.patch
@@ -58,20 +58,20 @@
 BuildRequires:	rpmbuild(macros) >= 1.202
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
-PreReq:		rc-scripts >= 0.2.0
-PreReq:		setup >= 2.4.6
-Requires(pre):	/bin/id
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/lib/rpm/user_group.sh
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/useradd
-Requires(post,preun):	/sbin/chkconfig
+Requires(post):	/bin/hostname
 Requires(post):	fileutils
 Requires(post):	findutils
 Requires(post):	grep
-Requires(post):	/bin/hostname
+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/lib/rpm/user_group.sh
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires:	rc-scripts >= 0.2.0
+Requires:	setup >= 2.4.6
 Provides:	group(squid)
 Provides:	user(squid)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -592,7 +592,7 @@
 
 %attr(754,root,root) /etc/rc.d/init.d/squid
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/squid
-%attr(640,root,squid) %config(noreplace) /etc/sysconfig/squid
+%attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/squid
 %attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/squid.conf
 %attr(640,root,squid) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.conf
 %attr(640,root,root) %{_sysconfdir}/mime.conf.default
@@ -741,6 +741,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.227  2005/10/31 15:12:20  glen
+- adapterized (PreReq killed)
+
 Revision 1.226  2005/10/31 15:07:22  glen
 - fix perl paths in %prep rather in %build
 
@@ -1204,7 +1207,7 @@
 - changed /usr/lib/squid{,/*} perms to 755, so squid can access it; release 4
 
 Revision 1.95  2002/08/19 13:40:09  blues
-license fix
+- license fix
 
 Revision 1.94  2002/08/16 23:52:19  qboosh
 - added missing dir, release 3
@@ -1217,11 +1220,11 @@
 - release 2
 - added patch from main squid site
 - finished new doc; more docs
-STBR
+  STBR
 
 Revision 1.91  2002/07/04 23:14:26  blues
 - ac_fix - allow compile with autoconf >2.5
-STBRKJM! buggy
+  STBRKJM! buggy
 
 Revision 1.90  2002/07/02 19:42:46  kloczek
 - merge translations from TurboLinux.
@@ -1237,9 +1240,9 @@
 - merge translations from Conectiva.
 
 Revision 1.86  2002/05/21 23:14:46  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.85  2002/04/02 20:05:16  kloczek
 - release 2.
@@ -1261,13 +1264,13 @@
 Revision 1.80  2002/02/21 16:39:39  mkochano
 - Release 1.
 - Updated to 2.4.STABLE4. This is a SECURITY FIX.
-STBR ASAP
+- STBR ASAP
 
 Revision 1.79  2002/02/19 18:53:35  gotar
 - %desc
 
 Revision 1.78  2002/01/18 02:15:03  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.77  2002/01/03 04:44:33  kloczek
 - updated to 2.4.STABLE3 (bug fix release),
@@ -1337,7 +1340,7 @@
 
 Revision 1.59  2001/04/08 02:56:22  blues
 - changed group /etc/sysconfig/squid - it's squid now . Without that
-squid was crushing while rotating.
+  squid was crushing while rotating.
 
 Revision 1.58  2001/04/04 00:27:41  kloczek
 - release 2,
@@ -1400,7 +1403,7 @@
 - release 7.
 
 Revision 1.49  2000/12/11 20:52:29  misiek
-/bin/false shell. Thanks to Marek Kolczyk.
+- /bin/false shell. Thanks to Marek Kolczyk.
 
 Revision 1.48  2000/12/04 06:49:17  kloczek
 - added Epoch: 6 (for allow upgrade from RH version).
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/squid.spec?r1=1.226&r2=1.227&f=u