[squid: 2/2] resolve merge conflict

[Henrik Nordström]

commit 6e8afcc6c0783a59b03012892282f9373e416207
Merge: 6b9acd1 9332c33
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Tue Jan 17 20:25:53 2012 +0100

    resolve merge conflict

 squid-3.2.0.14-gcc47.patch |   24 ++++++++++++++++++++++++
 squid.service              |    1 +
 squid.spec                 |   13 +++++++++++--
 3 files changed, 36 insertions(+), 2 deletions(-)
---
diff --cc squid.spec
index e48bc32,b817992..e05405e
--- a/squid.spec
+++ b/squid.spec
@@@ -41,6 -35,7 +41,7 @@@ Patch203: squid-3.0.STABLE1-perlpath.pa
  Patch204: squid-3.2.0.9-fpic.patch
  Patch205: squid-3.1.9-ltdl.patch
  Patch206: squid-3.2.0.13-errname.patch
 -Patch207: squid-3.2.0.14-gcc47.patch
++#Patch207: squid-3.2.0.14-gcc47.patch
  
  Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  Requires: bash >= 2.0
@@@ -107,6 -97,7 +108,7 @@@ The squid-sysvinit contains SysV initsc
  %patch204 -p1 -b .fpic
  %patch205 -p1 -b .ltdl
  %patch206 -p1 -b .errname
 -%patch207 -p1 -b .gcc47
++#patch207 -p1 -b .gcc47
  
  %build
  %ifarch sparcv9 sparc64 s390 s390x
@@@ -314,10 -305,13 +316,17 @@@ f
          /sbin/chkconfig --add squid >/dev/null 2>&1 || :
  
  %changelog
 +* Tue Jan 17 2012 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.2.0.14-4
- - fix for gcc-4.7
++- upstream gcc-4.7 patch
 +- fix for bug #772483 running out of memory, mem_node growing out of bounds
 +
+ * Mon Jan 16 2012 Jiri Skala <jskala at redhat.com> - 7:3.2.0.14-5
+ - fixes FTBFS due to gcc-4.7
+ 
+ * Fri Jan 13 2012 Jiri Skala <jskala at redhat.com> - 7:3.2.0.14-4
+ - fixes #772481 - Low number of open files for squid process
+ - fixes FTBFS due to gcc4.7
+ 
  * Thu Jan 05 2012 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.2.0.14-3
  - rebuild for gcc-4.7.0