From 5eadee80acd9e342e323d0745d962e73a637fcf6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Sun, 16 Jun 2019 07:30:50 +0200
Subject: v2.5.0

---
 php-bartlett-php-compatinfo-db.spec | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'php-bartlett-php-compatinfo-db.spec')

diff --git a/php-bartlett-php-compatinfo-db.spec b/php-bartlett-php-compatinfo-db.spec
index 44e688e..3857e52 100644
--- a/php-bartlett-php-compatinfo-db.spec
+++ b/php-bartlett-php-compatinfo-db.spec
@@ -7,12 +7,12 @@
 # Please, preserve the changelog entries
 #
 # See https://github.com/llaville/php-compatinfo-db/releases
-%global gh_commit    be9449b7c76ecfe07462edbcb83ec7fc7bc8f49e
+%global gh_commit    9425deab47261056f7c9a00bc1732fe392ca7bb3
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20151031
 %global gh_owner     llaville
 %global gh_project   php-compatinfo-db
-%global upstream_version  2.4.0
+%global upstream_version  2.5.0
 #global upstream_prever   RC1
 # Namespace
 %global ns_vendor    Bartlett
@@ -24,7 +24,7 @@
 
 Name:           php-%{c_vendor}-%{c_project}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-%global specrel 2
+%global specrel 1
 Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        Reference Database to be used with php-compatinfo library
 
@@ -40,8 +40,6 @@ Patch0:         %{name}-2.0-rpm.patch
 Patch1:         %{name}-curltls.patch
 
 # upstream patches
-Patch2:         https://github.com/llaville/php-compatinfo-db/commit/4d9b98524d4a6ebc1541d9a354c1f2511efac6d0.patch
-Patch3:         https://github.com/llaville/php-compatinfo-db/commit/effa54cf9433bc4aff5d77b453e4351215aeec14.patch
 
 BuildArch:      noarch
 # Needed to build the database from sources
@@ -146,8 +144,6 @@ Conflicts:      php-bartlett-PHP-CompatInfo < 5
 
 %patch0 -p1 -b .rpm
 %patch1 -p0 -b .curltls
-%patch2 -p1 -b .up1
-%patch3 -p1 -b .up2
 
 cat << 'EOF' | tee src/autoload.php
 <?php
@@ -250,10 +246,6 @@ require_once '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.ph
 \Fedora\Autoloader\Autoload::addPsr4('Bartlett\\Tests\\CompatInfoDb\\', __DIR__);
 EOF
 
-%if 0%{?fedora} >= 30
-rm tests/Reference/Extension/MbstringExtensionTest.php
-%endif
-
 %{_bindir}/phpunit \
     --include-path %{buildroot}%{_datadir}/php \
     -d memory_limit=1G
@@ -272,6 +264,9 @@ rm tests/Reference/Extension/MbstringExtensionTest.php
 
 
 %changelog
+* Sun Jun 16 2019 Remi Collet <remi@remirepo.net> - 2.5.0-1
+- update to 2.5.0
+
 * Tue Jun  4 2019 Remi Collet <remi@remirepo.net> - 2.4.0-2
 - add upstream patches for sqlite3 and imagick
 - open https://github.com/llaville/php-compatinfo-db/issues/30
-- 
cgit