From f5a34136c705727994917402ac0b4a360eeb4803 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 1 Oct 2019 09:51:10 +0200 Subject: - add patch for old libmaxmindb in EL-6 from https://github.com/maxmind/MaxMind-DB-Reader-php/pull/90 --- php-maxminddb.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'php-maxminddb.spec') diff --git a/php-maxminddb.spec b/php-maxminddb.spec index cee378a..3799db6 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -32,14 +32,16 @@ Summary: MaxMind DB Reader extension Name: %{?sub_prefix}php-maxminddb Version: 1.5.0 -%global rpmrel 1 -Release: %{rpmrel}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo "1".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +%global rpmrel 3 +Release: %{rpmrel}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{pkg_name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +Patch0: https://patch-diff.githubusercontent.com/raw/maxmind/MaxMind-DB-Reader-php/pull/90.patch + BuildRequires: %{?scl_prefix}php-devel >= 5.6 BuildRequires: pkgconfig(libmaxminddb) >= 1.0.0 @@ -155,6 +157,8 @@ Autoloader: %{_datadir}/php/MaxMind/Db/Reader/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 -b .pr90 + %if %{with_lib} %{_bindir}/phpab \ --template fedora \ @@ -303,9 +307,11 @@ exit $ret %changelog -* Tue Oct 1 2019 Remi Collet - 1.5.0-1 +* Tue Oct 1 2019 Remi Collet - 1.5.0-3 - update to 1.5.0 - raise dependency on PHP 5.6 +- add patch for old libmaxmindb in EL-6 from + https://github.com/maxmind/MaxMind-DB-Reader-php/pull/90 * Tue Sep 03 2019 Remi Collet - 1.4.1-2 - rebuild for 7.4.0RC1 -- cgit