From aecde494bdd1663fc371295a230ee26d87f07e58 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Thu, 8 Aug 2019 10:08:25 +0200 Subject: [PATCH] Pull in extra requirements to the build requirements to run more tests (on fedora: haproxy, vttest) --- varnish.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/varnish.spec b/varnish.spec index e3bb65b..7c58bc8 100644 --- a/varnish.spec +++ b/varnish.spec @@ -24,7 +24,7 @@ Summary: High-performance HTTP accelerator Name: varnish Version: 6.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: https://www.varnish-cache.org/ Source0: http://varnish-cache.org/_downloads/%{name}-%{version}%{?vd_rc}.tgz @@ -89,7 +89,13 @@ BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: gcc BuildRequires: make + +# Extra requirements for the build suite BuildRequires: nghttp2 +%if 0%{?fedora} +BuildRequires: haproxy +BuildRequires: vttest +%endif %if 0%{?rhel} == 6 BuildRequires: selinux-policy @@ -244,7 +250,7 @@ make %{?_smp_mflags} check VERBOSE=1 %install rm -rf %{buildroot} -# el6 and el7 defaults to LANG=C, which makes python3 fail on utf8 +# mock el6 and el7 defaults to LANG=C, which makes python3 fail when parsing utf8 text %if 0%{?rhel} == 6 || 0%{?rhel} == 7 export LANG=en_US.UTF-8 %endif @@ -413,6 +419,10 @@ fi %changelog +* Thu Aug 08 2019 Ingvar Hagelund - 6.2.0-3 +- Pull in extra requirements to the build requirements to run more + tests (on fedora: haproxy, vttest) + * Thu Apr 04 2019 Ingvar Hagelund - 6.2.0-2 - Run configure with LT_SYS_LIBRARY_PATH, removing the need for killing RPATH in libtool with sed and scattering LD_LIBRARY_PATH around