packages: squid/squid.spec - BR libcap-devel - renumbered patches

[baggins]

Author: baggins                      Date: Wed Sep  8 17:48:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR libcap-devel
- renumbered patches

---- Files affected:
packages/squid:
   squid.spec (1.318 -> 1.319) 

---- Diffs:

================================================================
Index: packages/squid/squid.spec
diff -u packages/squid/squid.spec:1.318 packages/squid/squid.spec:1.319
--- packages/squid/squid.spec:1.318	Wed Sep  8 19:40:19 2010
+++ packages/squid/squid.spec	Wed Sep  8 19:48:38 2010
@@ -41,13 +41,13 @@
 # Other patches:
 # http://zph.bratcheda.org/
 Source8:	%{name}-cachemgr-apache.conf
-Patch1:		%{name}-fhs.patch
-Patch2:		%{name}-location.patch
-Patch3:		%{name}-crash-on-ENOSPC.patch
-Patch4:		%{name}-empty-referer.patch
-Patch5:		%{name}-2.5.STABLE4-apache-like-combined-log.patch
-Patch6:		%{name}-ppc-m32.patch
-Patch7:		%{name}-cachemgr-webapp.patch
+Patch0:		%{name}-fhs.patch
+Patch1:		%{name}-location.patch
+Patch2:		%{name}-crash-on-ENOSPC.patch
+Patch3:		%{name}-empty-referer.patch
+Patch4:		%{name}-2.5.STABLE4-apache-like-combined-log.patch
+Patch5:		%{name}-ppc-m32.patch
+Patch6:		%{name}-cachemgr-webapp.patch
 URL:		http://www.squid-cache.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -55,6 +55,7 @@
 BuildRequires:	db-devel
 BuildRequires:	expat-devel
 BuildRequires:	heimdal-devel
+BuildRequires:	libcap-devel
 BuildRequires:	libltdl-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	openldap-devel >= 2.3.0
@@ -475,15 +476,15 @@
 # Bug fixes from Squid home page:
 
 # Other patches:
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%{?with_combined_log:%patch5 -p1}
+%{?with_combined_log:%patch4 -p1}
 %ifarch ppc
-%patch6 -p1
+%patch5 -p1
 %endif
-%patch7 -p1
+%patch6 -p1
 
 %{__sed} -i -e '1s#!.*bin/perl#!%{__perl}#' {contrib,scripts,helpers/*/*}/*.pl
 
@@ -882,6 +883,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.319  2010/09/08 17:48:38  baggins
+- BR libcap-devel
+- renumbered patches
+
 Revision 1.318  2010/09/08 17:40:19  baggins
 - ZPH support is built-in in 3.1 line
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/squid/squid.spec?r1=1.318&r2=1.319&f=u