Rebased patch for el6

This commit is contained in:
Ingvar Hagelund 2014-07-30 15:09:47 +02:00
parent 06c92f3992
commit c08ca2cca6
2 changed files with 16 additions and 2 deletions

View File

@ -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; }

View File

@ -6,7 +6,7 @@
Summary: High-performance HTTP accelerator Summary: High-performance HTTP accelerator
Name: varnish Name: varnish
Version: 4.0.1 Version: 4.0.1
Release: 1%{?v_rc}%{?dist} Release: 2%{?v_rc}%{?dist}
License: BSD License: BSD
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.varnish-cache.org/ 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: %{name}-trunk.tar.gz
#Source0: http://repo.varnish-cache.org/snapshots/%{name}-%{version}%{?vd_rc}.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 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# To build from git, start with a make dist, see redhat/README.redhat # To build from git, start with a make dist, see redhat/README.redhat
# You will need at least automake autoconf libtool python-docutils # You will need at least automake autoconf libtool python-docutils
@ -300,6 +300,9 @@ fi
%endif %endif
%changelog %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 * Wed Jul 30 2014 Ingvar Hagelund <ingvar@redpill-linpro.com> 4.0.1-1
- New upstream release - New upstream release
- systemd support for rhel7 - systemd support for rhel7