From 5673cb86c26ac3e17e8d3776fe3f8be23d2f978358cbe2f00621b92b9456e2cd Mon Sep 17 00:00:00 2001 From: Johannes Weberhofer Date: Mon, 7 Oct 2019 10:00:04 +0000 Subject: [PATCH] Accepting request 735647 from home:weberho:branches:Apache:Modules - Added autoreconf to allow building on factory version - Added apache2-mod_maxminddb-build.patch to make it buildable on opensuse fatory again. Does not build with LDFLAGS="-flto=8" OBS-URL: https://build.opensuse.org/request/show/735647 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_maxminddb?expand=0&rev=3 --- apache2-mod_maxminddb-build.patch | 12 ++++++++++++ apache2-mod_maxminddb.changes | 6 ++++++ apache2-mod_maxminddb.spec | 9 +++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 apache2-mod_maxminddb-build.patch diff --git a/apache2-mod_maxminddb-build.patch b/apache2-mod_maxminddb-build.patch new file mode 100644 index 0000000..e7239f7 --- /dev/null +++ b/apache2-mod_maxminddb-build.patch @@ -0,0 +1,12 @@ +diff -ur mod_maxminddb-1.1.0-orig/src/Makefile.am mod_maxminddb-1.1.0/src/Makefile.am +--- mod_maxminddb-1.1.0-orig/src/Makefile.am 2014-11-18 00:00:15.000000000 +0100 ++++ mod_maxminddb-1.1.0/src/Makefile.am 2019-10-07 11:29:38.515732542 +0200 +@@ -6,7 +6,7 @@ + + # compile the DSO file + module: mod_maxminddb.c $(TARGET) +- $(APXS) -c $(LDFLAGS) $(LIBMAXMINDDB_LDFLAGS) $(LIBS) $(WC) $(APXS_LDFLAGS) mod_maxminddb.c ++ $(APXS) -c $(LIBMAXMINDDB_LDFLAGS) $(LIBS) $(WC) $(APXS_LDFLAGS) mod_maxminddb.c + + install-exec-local: module + $(APXS) -i -a -n maxminddb .libs/mod_maxminddb.so diff --git a/apache2-mod_maxminddb.changes b/apache2-mod_maxminddb.changes index 8f88bfa..2d2965a 100644 --- a/apache2-mod_maxminddb.changes +++ b/apache2-mod_maxminddb.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Oct 7 09:44:02 UTC 2019 - Johannes Weberhofer + +- Added autoreconf to allow building on factory version +- Added apache2-mod_maxminddb-build.patch to make it buildable on opensuse fatory again. + Does not build with LDFLAGS="-flto=8" +------------------------------------------------------------------- Thu May 17 14:11:14 UTC 2018 - jweberhofer@weberhofer.at - Initial release 1.1.0 diff --git a/apache2-mod_maxminddb.spec b/apache2-mod_maxminddb.spec index 23ae89f..8384ea2 100644 --- a/apache2-mod_maxminddb.spec +++ b/apache2-mod_maxminddb.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_maxminddb # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,8 +26,11 @@ Group: Productivity/Networking/Web/Servers URL: https://maxmind.github.io/mod_maxminddb/ Source: https://github.com/maxmind/mod_maxminddb/releases/download/%{version}/mod_maxminddb-%{version}.tar.gz Source2: %{modname}.conf +# PATCH-FIX-OPENSUSE apache2-mod_maxminddb-build.patch -- Fix built on factory versions +Patch1: apache2-mod_maxminddb-build.patch BuildRequires: apache-rpm-macros BuildRequires: apache2-devel +BuildRequires: automake BuildRequires: pkgconfig BuildRequires: pkgconfig(libmaxminddb) Requires: %{apache_mmn} @@ -39,11 +42,13 @@ This module allows you to query MaxMind DB files from Apache 2.2+ using the libm %prep %setup -q -n %{modname}-%{version} +%patch1 -p1 # This config file is used for loading the module without # enabling any databases which are not available on OBS echo "MaxMindDBEnable On" > test-enable-module.conf %build +autoreconf %configure make %{?_smp_mflags}