diff --git a/.gitignore b/.gitignore index aec2562..789acef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /varnish-modules-0.12.1.tar.gz /varnish-modules-0.15.0.tar.gz /varnish-modules-0032ed8.tar.gz +/varnish-modules-0.16.0.tar.gz diff --git a/sources b/sources index b4e3785..90bd340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (varnish-modules-0032ed8.tar.gz) = 9ad2bc33a954645f267ae61a299fc067cb075959ade0ecc2dbf080867c6b3039835994b628aeea92ecfb0b3bbce9d3fae83945f48b57df32a2e86c030ee1c704 +SHA512 (varnish-modules-0.16.0.tar.gz) = 614bb99cf48d33710f06ed52bacff092c8a60ddd8f5eb55470cf571e44ca01cc9696b4c8669dc6979ab7096762cb6ef80435e210aa38f9eaaf31a1dd73d858e2 diff --git a/varnish-modules.spec b/varnish-modules.spec index 141719b..1cc69ad 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -1,8 +1,5 @@ %global varnishver %(pkg-config --silence-errors --modversion varnishapi || echo 0) -%global commit 0032ed81820cbc7d8d0bdda8f0a14dc968a9de4f -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - %if 0%{?rhel} == 7 || 0%{?rhel} == 6 %global docutils python34-docutils %else @@ -11,13 +8,13 @@ Name: varnish-modules Version: 0.16.0 -Release: 0.1.20200318git%{shortcommit}%{?dist} +Release: 1%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD URL: https://github.com/varnish/%{name} -Source: https://github.com/varnish/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz -#Source: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz +#Source: https://download.varnish-software.com/varnish-modules/#{name}-#{version}.tar.gz +Source: https://github.com/varnish/varnish-modules/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: make @@ -50,12 +47,10 @@ tcp, var, xkey %prep -%autosetup -n %{name}-%{commit} -#autosetup +%autosetup %build -sh bootstrap %configure %make_build @@ -80,7 +75,10 @@ sed -i 's,tests/xkey/test12.vtc,,' src/Makefile %{_mandir}/man3/*.3* %changelog -* Tue Mar 17 2020 Ingvar Hagelund - 0.15.1-0.1.20200317git21d0c84 +* Sat Mar 28 2020 Ingvar Hagelund - 0.16.0-1 +- New upstream release + +* Tue Mar 17 2020 Ingvar Hagelund - 0.16.0-0.1.20200317git21d0c84 - Snapshot from 6.4 branch, rebuilt against varnish-6.4.0 - Removed patches merged upstream - Delete 64-bit specific test on 32-bit arches