diff --git a/varnish-7.0.0_fixb00046.patch b/varnish-7.0.0_fixb00046.patch deleted file mode 100644 index 764e0e9..0000000 --- a/varnish-7.0.0_fixb00046.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/varnishtest/tests/b00046.vtc.orig 2021-09-22 21:03:57.909742460 +0200 -+++ bin/varnishtest/tests/b00046.vtc 2021-09-22 21:04:03.075783664 +0200 -@@ -18,7 +18,7 @@ - varnish v1 -vcl+backend {} -start - - client c1 { -- delay 0.5 -+ delay 2 - send_urgent " " - expect_close - } -run diff --git a/varnish.spec b/varnish.spec index 957cb5d..4497bd7 100644 --- a/varnish.spec +++ b/varnish.spec @@ -64,9 +64,6 @@ Source1: https://github.com/varnishcache/pkg-varnish-cache/archive/%{commit1}.ta # Patch 018: gcc-10.0.1/s390x compilation fix, upstream commit b0af060 #Patch18: varnish-6.3.2_fix_s390x.patch -# Patch 019: fixes build on armv7hl. Simple timing issue -Patch19: varnish-7.0.0_fixb00046.patch - %if 0%{?fedora} > 29 Provides: varnish%{_isa} = %{version}-%{release} Provides: varnishd(abi)%{_isa} = %{abi} @@ -153,7 +150,6 @@ Documentation files for %name %prep %setup -q -%patch19 tar xzf %SOURCE1 ln -s pkg-varnish-cache-%{commit1}/redhat redhat ln -s pkg-varnish-cache-%{commit1}/debian debian @@ -199,10 +195,13 @@ rm -rf doc/html/_sources %check -# Remove this for now. Hard to get the size and timing right +# Remove these for now. Hard to get the size and timing right %ifarch s390 s390x aarch64 rm bin/varnishtest/tests/o00005.vtc %endif +%ifarch armv7hl +rm bin/varnishtest/tests/b00046.vtc +%endif %make_build check @@ -304,7 +303,6 @@ test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc * Thu Sep 16 2021 Ingvar Hagelund - 7.0.0-1 - New upstream release - Updated pkg-varnish checkout from the 7.0 branch -- Added a minimal patch for a failing test on armv7hl * Fri Jul 23 2021 Fedora Release Engineering - 6.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild