From 780392f10eb447ae2b45b3c297d0cf10f7bb4c3c Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@redpill-linpro.com>
Date: Fri, 21 Apr 2017 08:44:27 +0200
Subject: [PATCH] New upstream release Updated pkg-varnish checkout to 5b97619,
 setting systemd memlock limit   to actual 82MB, as it says in the comment
 Disabled stripping and building of debug packages, upstream issue #2269

---
 .gitignore   |  2 ++
 sources      |  3 +--
 varnish.spec | 21 +++++++++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index cdf7ce3..52664f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@ varnish-2.1.3.tar.gz
 /pkg-varnish-cache-502fcc0.tar.gz
 /varnish-5.1.1.tar.gz
 /pkg-varnish-cache-92373fe.tar.gz
+/pkg-varnish-cache-5b97619.tar.gz
+/varnish-5.1.2.tar.gz
diff --git a/sources b/sources
index fc8c320..31c6450 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (pkg-varnish-cache-92373fe.tar.gz) = 58e21ed8a999b61d0b41abd39d28246384ab7db522560a68d9f1e179931394e1621bc42109e75970455318739fcf2c3a7b42514dffc701566224d45d84455b51
-SHA512 (varnish-5.1.1.tar.gz) = d5acb1fa9d55f5bb77bea85a6db637769126b701c010cffd511e8ac9fd67853e7f0d3bf86ba1ff067031e14a320b3bc9a84c66cd4a5a6b66d30226f5184f5f05
+SHA512 (varnish-5.1.2.tar.gz) = 6ee71c2678a34f7e3963547d8e79bd83e3b326ffe703ad60f0d6f8f218a3801849c870aa00e407008ef22cd2b2baf4cbe02625ce77018279afdb8208d43a743b
diff --git a/varnish.spec b/varnish.spec
index 7b9ed5e..69d1b99 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -4,14 +4,19 @@
 %define    _use_internal_dependency_generator 0
 %define __find_provides %{_builddir}/%{name}-%{version}%{?v_rc:-%{?v_rc}}/redhat/find-provides
 
+# https://github.com/varnishcache/varnish-cache/issues/2269
+%define debug_package %{nil}
+%define _enable_debug_package 0
+%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+
 # Package scripts are now external
 # https://github.com/varnishcache/pkg-varnish-cache
-%define commit1 92373fee0017d6087977e31eb88f9af227b6d9d5
+%define commit1 5b976190ce9e0720f1eee6e9eaccd8a15eaa498d
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
 
 Summary: High-performance HTTP accelerator
 Name: varnish
-Version: 5.1.1
+Version: 5.1.2
 Release: 1%{?v_rc}%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -99,7 +104,7 @@ Group: Development/Libraries
 BuildRequires: ncurses-devel
 Requires: varnish-libs = %{version}-%{release}
 Requires: python
-Provides: varnish-libs-devel
+Provides: varnish-libs-devel = %{version}-%{release}
 Obsoletes: varnish-libs-devel
 
 %description devel
@@ -140,13 +145,15 @@ export CFLAGS="%{optflags} -fPIC"
 export LDFLAGS=" -pie"
 %endif
 
-# https://gcc.gnu.org/wiki/FAQ#PR323%ifarch i386 i686
+# https://gcc.gnu.org/wiki/FAQ#PR323
+%ifarch i386 i686
 %if 0%{?fedora} > 21
 export CFLAGS="%{optflags} -ffloat-store -fexcess-precision=standard"
 %endif
 %if 0%{?rhel} >= 6
 export CFLAGS="%{optflags} -fPIC -ffloat-store"
 %endif
+%endif
 
 # Man pages are prebuilt. No need to regenerate them.
 export RST2MAN=/bin/true
@@ -389,6 +396,12 @@ fi
 %endif
 
 %changelog
+* Fri Apr 07 2017 Ingvar Hagelund <ingvar@redpill-linpro.com> 5.1.2-1
+- New upstream release
+- Updated pkg-varnish checkout to 5b97619, setting systemd memlock limit
+  to actual 82MB, as it says in the comment
+- Disabled stripping and building of debug packages, upstream issue #2269
+
 * Thu Mar 16 2017 Ingvar Hagelund <ingvar@redpill-linpro.com> 5.1.1-1
 - New upstream release
 - Rebased patches for 5.1.1