From 7f0918b6354d8315fc324ac9ca0d790193a6dfc4 Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@redpill-linpro.com>
Date: Fri, 15 Feb 2019 10:37:58 +0100
Subject: [PATCH] Added a simple patch from upstream, fixing a formatting bug
 trigged on 32bit Removed dependency on docutils. It is not necessary on
 released tarballs

---
 ...les-0.15.0_fix_simple_formatting_bug.patch | 23 +++++++++++++++++++
 varnish-modules.spec                          | 14 ++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 varnish-modules-0.15.0_fix_simple_formatting_bug.patch

diff --git a/varnish-modules-0.15.0_fix_simple_formatting_bug.patch b/varnish-modules-0.15.0_fix_simple_formatting_bug.patch
new file mode 100644
index 0000000..9f05e8d
--- /dev/null
+++ b/varnish-modules-0.15.0_fix_simple_formatting_bug.patch
@@ -0,0 +1,23 @@
+From 40a8cc063b2819fdd325061a1cb48a3adc3ec910 Mon Sep 17 00:00:00 2001
+From: Dridi Boukelmoune <dridi.boukelmoune@gmail.com>
+Date: Wed, 17 Oct 2018 12:42:22 +0200
+Subject: [PATCH] 32bit-friendly format in vmod-tcp
+
+Fixes #122
+---
+ src/vmod_tcp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/vmod_tcp.c b/src/vmod_tcp.c
+index fee4bd3..570be45 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 %jd KB/s.", (intmax_t)rate);
+ 
+ #  ifndef NDEBUG
+         int retval;
diff --git a/varnish-modules.spec b/varnish-modules.spec
index 7d908d2..dd635c0 100644
--- a/varnish-modules.spec
+++ b/varnish-modules.spec
@@ -1,16 +1,19 @@
+%global varnishver %(pkg-config --silence-errors --modversion varnishapi || echo 0)
+
+
 Name:    varnish-modules
 Version: 0.15.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A collection of modules ("vmods") extending Varnish VCL
 
 License: BSD
 URL:     https://github.com/varnish/%{name}
 Source:  https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz
 Patch10: varnish-modules-0.15.0_fix_saintmode_for_varnish_6.1.patch
+Patch11: varnish-modules-0.15.0_fix_simple_formatting_bug.patch
 BuildRequires: gcc
 BuildRequires: make
 BuildRequires: pkgconfig(varnishapi)
-BuildRequires: python-docutils
 BuildRequires: varnish
 
 Requires: varnish
@@ -35,9 +38,10 @@ tcp, var, xkey
 
 %prep
 %setup -q
-%if 0%{?fedora} == 30
+%if "%varnishver" >= "6.1" 
 %patch10 -p1
 %endif
+%patch11 -p1
 
 %build
 %configure
@@ -62,6 +66,10 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Fri Feb 15 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.15.0-4
+- Added a simple patch from upstream, fixing a formatting bug trigged on 32bit
+- Removed dependency on docutils. It is not necessary on released tarballs
+
 * Thu Feb 14 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.15.0-3
 - Added a proposed patch from Nils Goroll providing support for vmod_saintmode
   on varnish-6.1.1 (closes rhbz #1676183)