From c08ca2cca6d964f3c2489d23667734a56f3b2cf3 Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@redpill-linpro.com>
Date: Wed, 30 Jul 2014 15:09:47 +0200
Subject: [PATCH] Rebased patch for el6

---
 varnish-4.0.1_fix_Werror_el6.patch | 11 +++++++++++
 varnish.spec                       |  7 +++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 varnish-4.0.1_fix_Werror_el6.patch

diff --git a/varnish-4.0.1_fix_Werror_el6.patch b/varnish-4.0.1_fix_Werror_el6.patch
new file mode 100644
index 0000000..e798e6a
--- /dev/null
+++ b/varnish-4.0.1_fix_Werror_el6.patch
@@ -0,0 +1,11 @@
+--- configure.orig	2014-07-30 14:35:18.781987406 +0200
++++ configure	2014-07-30 14:36:12.686122224 +0200
+@@ -16978,7 +16978,7 @@
+ # The reason for -Wno-error=unused-result is a glibc/gcc interaction
+ # idiocy where write is marked as warn_unused_result, causing build
+ # failures.
+-CFLAGS="${CFLAGS} -Wall -Werror"
++#CFLAGS="${CFLAGS} -Wall -Werror"
+ OCFLAGS="${OCFLAGS} -Wall -Werror"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unused-result" >&5
+ $as_echo_n "checking whether C compiler accepts -Werror=unused-result... " >&6; }
diff --git a/varnish.spec b/varnish.spec
index 1c34d96..2b560b6 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -6,7 +6,7 @@
 Summary: High-performance HTTP accelerator
 Name: varnish
 Version: 4.0.1
-Release: 1%{?v_rc}%{?dist}
+Release: 2%{?v_rc}%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -15,7 +15,7 @@ Source0: http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
 #Source0: %{name}-trunk.tar.gz
 #Source0: http://repo.varnish-cache.org/snapshots/%{name}-%{version}%{?vd_rc}.tar.gz
 Patch1:  varnish-4.0.0.fix_ld_library_path_in_sphinx_build.patch
-Patch2:  varnish-4.0.0_fix_Werror_el6.patch
+Patch2:  varnish-4.0.1_fix_Werror_el6.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # To build from git, start with a make dist, see redhat/README.redhat 
 # You will need at least automake autoconf libtool python-docutils
@@ -300,6 +300,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 30 2014 Ingvar Hagelund <ingvar@redpill-linpro.com> 4.0.1-2
+- Rebased patch for el6
+
 * Wed Jul 30 2014 Ingvar Hagelund <ingvar@redpill-linpro.com> 4.0.1-1 
 - New upstream release 
 - systemd support for rhel7