This commit is contained in:
Henrik Nordström 2010-02-25 11:25:51 +00:00
parent 86d2c8c828
commit ba07d10e8d
3 changed files with 11 additions and 14 deletions

View File

@ -1,4 +1,2 @@
squid-3.1.0.16.tar.bz2
squid-3.1.0.16.tar.bz2.asc
squid-3.1-9881.patch
squid-3.1-9882.patch
squid-3.1.0.17.tar.bz2
squid-3.1.0.17.tar.bz2.asc

View File

@ -1,4 +1,2 @@
e795d79cf37ec91f59d09c6804a2555b squid-3.1.0.16.tar.bz2
454d2e4205e1b3d4444b057fa417973b squid-3.1.0.16.tar.bz2.asc
3c6cc1e7feac49fed423d5fd56ac3fa4 squid-3.1-9881.patch
e0e7cb7f286efcf9c027aec904674f55 squid-3.1-9882.patch
5acabbc26f52363389703a8ce510c88d squid-3.1.0.17.tar.bz2
f70d58df04ffc2d92d89e90f8e62352b squid-3.1.0.17.tar.bz2.asc

View File

@ -3,8 +3,8 @@
## % define __find_requires %{SOURCE99}
Name: squid
Version: 3.1.0.16
Release: 7%{?dist}
Version: 3.1.0.17
Release: 1%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
License: GPLv2
@ -21,8 +21,7 @@ Source98: perl-requires-squid.sh
## Source99: filter-requires-squid.sh
# Upstream patches
Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9881.patch
Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-9882.patch
#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-XXXX.patch
# Local patches
# Applying upstream patches first makes it less likely that local patches
@ -71,8 +70,7 @@ lookup program (dnsserver), a program for retrieving FTP data
%prep
%setup -q
%patch001 -p0 -b .3.1-9881
%patch002 -p0 -b .3.1-9882
#patch001 -p0 -b .3.1-xxxx
%patch201 -p1 -b .config
%patch202 -p1 -b .location
@ -264,6 +262,9 @@ fi
%changelog
* Thu Feb 25 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.17-1
- Upgrade to 3.1.0.17
* Thu Feb 18 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.16-7
- Workaround for Fedora-13 build failure