rpms/squid/F-11 .cvsignore, 1.41, 1.42 sources, 1.44, 1.45 squid.spec, 1.121, 1.122

[Henrik Nordström]

Author: hno

Update of /cvs/pkgs/rpms/squid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28721

Modified Files:
	.cvsignore sources squid.spec 
Log Message:
3.0.STABLE16


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	9 May 2009 22:06:08 -0000	1.41
+++ .cvsignore	13 Jul 2009 11:53:57 -0000	1.42
@@ -1 +1,3 @@
-squid-3.0.STABLE15.tar.bz2
+squid-3.0.STABLE16.tar.bz2
+b9052.patch
+b9053.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	9 May 2009 22:06:08 -0000	1.44
+++ sources	13 Jul 2009 11:53:57 -0000	1.45
@@ -1 +1,3 @@
-5830a3c8e8d64f3483b38093da2a96fa  squid-3.0.STABLE15.tar.bz2
+aa039a2c75404a496f0e99a278599e00  squid-3.0.STABLE16.tar.bz2
+8039be92fb6ca5a71dd11b7d99c841fa  b9052.patch
+edcea01a412a23fb0ceaddf0eaa16c8b  b9053.patch


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-11/squid.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- squid.spec	23 May 2009 11:52:39 -0000	1.121
+++ squid.spec	13 Jul 2009 11:53:57 -0000	1.122
@@ -3,7 +3,7 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE15
+Version:  3.0.STABLE16
 Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
@@ -22,6 +22,8 @@ Source98: perl-requires-squid.sh
 
 # Upstream patches
 #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9052.patch
+Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9053.patch
 
 # External patches
 
@@ -34,7 +36,6 @@ Patch203: squid-3.0.STABLE1-build.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.0.STABLE15-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
-Patch209: squid-3.0.STABLE13-gcc44.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -60,13 +61,14 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
+%patch001 -p0 -b .b9052
+%patch002 -p0 -b .b9053
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
 %patch208 -p1 -b .from_manpg
-%patch209 -p1 -b .gcc44
 
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
@@ -342,6 +344,12 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Wed Jul 01 2009 Jiri Skala <jskala at redhat.com> 3.0.STABLE16-2
+- fixed patch parameter of bXXX patches
+
+* Mon Jun 29 2009 Henrik Nordstrom <henrik at henriknordstrom.net> 3.0.STABLE16-1
+- Upgrade to 3.0.STABLE16
+
 * Sat May 23 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE15-2
 - Bug #453304 - Squid requires restart after Network Manager connection setup