diff --git a/.gitignore b/.gitignore index bd4d881..c87103c 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ varnish-2.1.3.tar.gz /varnish-6.4.0.tgz /varnish-6.5.0.tgz /varnish-6.5.1.tgz +/varnish-6.6.0.tgz diff --git a/sources b/sources index 68e4dc9..abababe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (varnish-6.5.1.tgz) = 0f34f2c6fe68bfcdba488cda40cc387b3c10343923a75a6a1791c890d20e79c64069697c45720cd5f0cba666d506d3ab6bb814ef4f9120cf0c8519a01144844f +SHA512 (varnish-6.6.0.tgz) = 0f52e94dd866a7cf141f9333a9169b396627f169907acb2d64f18dcac3188f9d9f1e72ea9eb9f2c0c19a5f53df0c90446041eb2b1e52f4756ea257efb329d0d1 SHA512 (pkg-varnish-cache-ec7ad9e.tar.gz) = 146aacec76b2ca641bb8bc9dda49e82d28740dbcba034e73a8d39387696f10fa3108ab124a078e900865388217352d112f63f6fe9ef7b23e20bc699441aab4f2 diff --git a/varnish.spec b/varnish.spec index 05e13a8..5cf7952 100644 --- a/varnish.spec +++ b/varnish.spec @@ -22,8 +22,8 @@ Summary: High-performance HTTP accelerator Name: varnish -Version: 6.5.1 -Release: 4%{?dist} +Version: 6.6.0 +Release: 1%{?dist} License: BSD URL: https://www.varnish-cache.org/ Source0: http://varnish-cache.org/_downloads/%{name}-%{version}.tgz @@ -76,9 +76,9 @@ Provides: vmod(purge)%{_isa} = %{version}-%{release} Provides: vmod(std)%{_isa} = %{version}-%{release} Provides: vmod(unix)%{_isa} = %{version}-%{release} Provides: vmod(vtc)%{_isa} = %{version}-%{release} +Provides: vmod_purge.so%{_isa} = %{version}-%{release} %endif -Obsoletes: varnish-libs < %{version}-%{release} %if 0%{?rhel} == 7 BuildRequires: python34 python34-sphinx python34-docutils @@ -97,9 +97,9 @@ BuildRequires: make BuildRequires: nghttp2 # haproxy is broken in rawhide now -#if 0#{?fedora} || 0#{?rhel} >= 8 -#BuildRequires: haproxy -#endif +%if 0%{?rhel} >= 8 +BuildRequires: haproxy +%endif Requires: logrotate Requires: ncurses @@ -233,9 +233,10 @@ install -D -m 0755 redhat/varnishreload %{buildroot}%{_sbindir}/varnishreload echo %{_libdir}/varnish > %{buildroot}%{_sysconfdir}/ld.so.conf.d/varnish-%{_arch}.conf # No idea why these ends up with mode 600 in the debug package +%if 0%{debug_package} chmod 644 lib/libvmod_*/*.c chmod 644 lib/libvmod_*/*.h - +%endif %files %{_sbindir}/* @@ -297,6 +298,12 @@ test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc %changelog +* Mon Mar 15 2021 Ingvar Hagelund - 6.6.0-1 +- New upstream release +- Now provides vmod_purge +- Uses haproxy in the test suite on el8 +- Skipped obsoleting varnish-libs. That was many years ago now. + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 6.5.1-4 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583.