From 06d9ab1393d88156ee06f8e2b4a9080cf72e7ad9 Mon Sep 17 00:00:00 2001 From: Lubos Uhliarik Date: Fri, 10 Aug 2018 09:56:44 +0000 Subject: [PATCH] Fixed i686 build failure updated to newer version (0.15.0) Drop EPEL and older Fedora releases support Drop broken manual ABI dependency to Varnish Drop commented out references to past patches Verbose test suite Simplified configure step Dependencies cleanup --- varnish-modules-0.15.0-vmod-tcp-int.patch | 13 +++++++ varnish-modules.spec | 45 ++++++++++++++++++----- 2 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 varnish-modules-0.15.0-vmod-tcp-int.patch diff --git a/varnish-modules-0.15.0-vmod-tcp-int.patch b/varnish-modules-0.15.0-vmod-tcp-int.patch new file mode 100644 index 0000000..bc31cf4 --- /dev/null +++ b/varnish-modules-0.15.0-vmod-tcp-int.patch @@ -0,0 +1,13 @@ +diff --git a/src/vmod_tcp.c b/src/vmod_tcp.c +index fee4bd3..e1c5dfa 100644 +--- a/src/vmod_tcp.c ++++ b/src/vmod_tcp.c +@@ -174,7 +174,7 @@ vmod_set_socket_pace(VRT_CTX, VCL_INT rate) + sizeof(pacerate)) != 0) + VSLb(ctx->vsl, SLT_VCL_Error, "set_socket_pace(): Error setting pace rate."); + else +- VSLb(ctx->vsl, SLT_VCL_Log, "vmod-tcp: Socket paced to %lu KB/s.", rate); ++ VSLb(ctx->vsl, SLT_VCL_Log, "vmod-tcp: Socket paced to %d KB/s.", pacerate); + + # ifndef NDEBUG + int retval; diff --git a/varnish-modules.spec b/varnish-modules.spec index a2f3e5b..ef1493e 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -1,3 +1,12 @@ +%define abi 6.1 + +%bcond_without python2 +%bcond_with python3 + +%if %{with python2} == %{with python3} +%error Pick exactly one Python version +%endif + Name: varnish-modules Version: 0.15.0 Release: 1%{?dist} @@ -7,13 +16,23 @@ Group: System Environment/Daemons License: BSD URL: https://github.com/varnish/%{name} Source: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz +Patch1: varnish-modules-0.15.0-vmod-tcp-int.patch BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig(varnishapi) -BuildRequires: python-docutils BuildRequires: varnish +%if %{with python3} +BuildRequires: python3-docutils +%define rst2man %{_bindir}/rst2man +%define vpython %{_bindir}/python3 +%else +BuildRequires: python-docutils +%define rst2man %{_bindir}/rst2man +%define vpython %{_bindir}/python2 +%endif + Requires: varnish Provides: vmod-bodyaccess = %{version}-%{release} @@ -37,6 +56,8 @@ tcp, var, xkey %prep %setup -q +%patch1 -p1 -b .vmod-tcp-int + %build %configure @@ -61,8 +82,9 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' %changelog -* Tue Jul 17 2018 Dridi Boukelmoune 0.15.0-1 -- Update to 0.15.0 +* Sun Aug 05 2018 Lubos Uhliarik - 0.15.0-1 +- Fixed i686 build failure +- updated to newer version (0.15.0) - Drop EPEL and older Fedora releases support - Drop broken manual ABI dependency to Varnish - Drop commented out references to past patches @@ -70,14 +92,17 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' - Simplified configure step - Dependencies cleanup -* Sat Jul 14 2018 Fedora Release Engineering - 0.12.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Tue Apr 24 2018 Lubos¡ Uhliarik - 0.12.16 +- use rst2man binary for both python2 and python3 -* Fri Feb 09 2018 Fedora Release Engineering - 0.12.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Mon Apr 16 2018 Joe Orton - 0.12.1-4.4 +- fix abi requires (#1566046) -* Sat Oct 21 2017 Dridi Boukelmoune 0.12.1-5 -- Update varnishabi requirement for f28 +* Thu Mar 29 2018 Joe Orton - 0.12.1-4.2 +- fix use of rst2man with python3-docutils + +* Wed Mar 28 2018 Joe Orton - 0.12.1-4.1 +- add Python build conditionals * Thu Aug 03 2017 Fedora Release Engineering - 0.12.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild @@ -112,3 +137,5 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' - First wrap for fedora - Uses some old-style specfile components for el5 compatibility, including the usage of the BuildRoot header and cleaning the buildroot before install + +