diff options
| author | Remi Collet <remi@remirepo.net> | 2020-10-02 07:12:40 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-10-02 07:12:40 +0200 |
| commit | ef40fe219101a0b59c1a684972480dd8f744cdaf (patch) | |
| tree | 7d234e6b93f6477cbe19681164230d4f12320352 /php-maxminddb.spec | |
| parent | c3530b45706637f6a363f6577d7c0ee58b93f86a (diff) | |
update to 1.8.0
drop patches merged upstream
Diffstat (limited to 'php-maxminddb.spec')
| -rw-r--r-- | php-maxminddb.spec | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 906b29b..b9aafe2 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -17,7 +17,7 @@ %global with_tests 0%{!?_without_tests:1} -%global gh_commit 942553da239f12051275f9c666538b5dd09e2908 +%global gh_commit b566d429ac9aec10594b0935be8ff38302f8d5c8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner maxmind %global gh_project MaxMind-DB-Reader-php @@ -31,9 +31,9 @@ Summary: MaxMind DB Reader extension Name: %{?sub_prefix}php-maxminddb -Version: 1.7.0 -%global rpmrel 3 -Release: %{rpmrel}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.8.0 +%global rpmrel 1 +Release: %{rpmrel}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo "1".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -41,9 +41,6 @@ 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/108.patch -Patch1: https://patch-diff.githubusercontent.com/raw/maxmind/MaxMind-DB-Reader-php/pull/109.patch - BuildRequires: %{?scl_prefix}php-devel >= 7.2 BuildRequires: %{?scl_prefix}php-pear >= 1.10 BuildRequires: pkgconfig(libmaxminddb) >= 1.0.0 @@ -161,8 +158,6 @@ Autoloader: %{_datadir}/php/MaxMind/Db/Reader/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .pr -%patch1 -p1 -b .pr %if %{with_lib} %{_bindir}/phpab \ @@ -336,6 +331,10 @@ fi # when using pkgup, CHECK Release! %changelog +* Fri Oct 2 2020 Remi Collet <remi@remirepo.net> - 1.8.0-1 +- update to 1.8.0 +- drop patches merged upstream + * Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.7.0-3 - rebuild for PHP 8.0.0RC1 - add patch for PHP 8.0.0rc1 from |