[rpms/php-maxminddb] rawhide: v1.14.0

[rpms/php-maxminddb] rawhide: v1.14.0

[Remi Collet]

A new commit has been pushed.

Repo   : rpms/php-maxminddb
Branch : rawhide
Commit : cfe553ac7c026d9bec10205b9d8d7677d5937318
Author : Remi Collet <remi@fedoraproject.org>
Date   : 2026-09-11T09:38:49+02:00
Stats  : +34/-30 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/php-maxminddb/c/cfe553ac7c026d9bec10205b9d8d7677d5937318?branch=rawhide

Log:
v1.14.0

---
diff --git a/.gitignore b/.gitignore
index 29fac45..431496b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ clog
 /php-maxminddb-1.12.1-815939e.tgz
 /php-maxminddb-1.13.0-b298986.tgz
 /php-maxminddb-1.13.1-2194f58.tgz
+/php-maxminddb-1.14.0.tgz

diff --git a/makesrc.sh b/makesrc.sh
index ea1e7e8..4639ba9 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -4,24 +4,17 @@ NAME=$(basename $PWD)
 OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
 PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
 VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
-COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
-SHORT=${COMMIT:0:7}
 
 echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
 
 echo "Cloning..."
-rm -rf $PROJECT-$COMMIT
-git clone --recursive https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
-
-echo "Getting commit..."
-pushd $PROJECT-$COMMIT
-git checkout $COMMIT
-popd
+rm -rf $PROJECT-$VERSION
+git clone --depth 1 --recursive https://github.com/$OWNER/$PROJECT.git -b v$VERSION $PROJECT-$VERSION
 
 echo "Archiving..."
-tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+tar czf $NAME-$VERSION.tgz --exclude-vcs .git $PROJECT-$VERSION
 
 echo "Cleaning..."
-rm -rf $PROJECT-$COMMIT
+rm -rf $PROJECT-$VERSION
 
 echo "Done."

diff --git a/php-maxminddb.spec b/php-maxminddb.spec
index 52a832c..722dbc2 100644
--- a/php-maxminddb.spec
+++ b/php-maxminddb.spec
@@ -9,8 +9,6 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit   2194f58d0f024ce923e685cdf92af3daf9951908
-%global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    maxmind
 %global gh_project  MaxMind-DB-Reader-php
 # Extension
@@ -24,6 +22,8 @@
 %global _configure   ../ext/configure
 
 %if 0%{?fedora}
+# Option to disable library tests (phpunit)
+# Extension is always tested
 %bcond_without       tests
 %else
 %bcond_with          tests
@@ -32,18 +32,19 @@
 Name:          php-maxminddb
 Summary:       MaxMind DB Reader extension
 License:       Apache-2.0
-Version:       1.13.1
-Release:       4%{?dist}
+Version:       1.14.0
+Release:       1%{?dist}
 URL:           https://github.com/%{gh_owner}/%{gh_project}
 
-Source0:       %{name}-%{version}-%{gh_short}.tgz
+Source0:       %{name}-%{version}.tgz
 Source1:       makesrc.sh
 
 ExcludeArch:   %{ix86}
 
 BuildRequires: make
 BuildRequires: gcc
-BuildRequires: php-devel >= 7.2
+# Upstream requires 7.2, 8.0 because of test suite
+BuildRequires: php-devel >= 8.0
 BuildRequires: pkgconfig(libmaxminddb) >= 1.0.0
 
 Requires:      php(zend-abi) = %{php_zend_api}
@@ -87,7 +88,7 @@ BuildRequires: php-gmp
 #        "php-coveralls/php-coveralls": "^2.1",
 #        "phpunit/phpcov": ">=6.0.0",
 #        "squizlabs/php_codesniffer": "3.*"
-BuildRequires: phpunit8
+BuildRequires: phpunit9
 %endif
 
 # from composer.json "require": {
@@ -101,7 +102,7 @@ Recommends:    php-bcmath
 Recommends:    php-gmp
 Recommends:    php-maxminddb
 # from composer.json "conflict": {
-#        "ext-maxminddb": "<1.11.1,>=2.0.0"
+#        "ext-maxminddb": "<1.14.0,>=2.0.0"
 Conflicts:     php-maxminddb < %{version}
 # Weak dependencies on databases
 Recommends:    geolite2-country
@@ -130,7 +131,8 @@ Autoloader: %{_datadir}/php/MaxMind/Db/Reader/autoload.php
 
 
 %prep
-%setup -q -n %{gh_project}-%{gh_commit}
+%setup -q -n %{gh_project}-%{version}
+
 %{_bindir}/phpab \
     --template fedora \
     --output src/MaxMind/Db/Reader/autoload.php \
@@ -193,19 +195,23 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
 
 %if %{with tests}
 cd ..
+mkdir vendor
+%{_bindir}/phpab \
+    --template fedora \
+    --output vendor/autoload.php \
+    tests
+
+cat << 'EOF' | tee -a vendor/autoload.php
+require_once "%{buildroot}%{_datadir}/php/MaxMind/Db/Reader/autoload.php";
+EOF
+
 : Upstream test suite for the library
-for cmd in php80 php81 php82 php83 php84; do
-  if which $cmd; then
-    $cmd %{_bindir}/phpunit8 \
-      --bootstrap %{buildroot}%{_datadir}/php/MaxMind/Db/Reader/autoload.php \
-      --verbose || ret=1
-  fi
-done
+php %{_bindir}/phpunit9 \
+    --verbose || ret=1
 
 : Upstream test suite for the library with the extension
 php --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
-  %{_bindir}/phpunit8 \
-    --bootstrap %{buildroot}%{_datadir}/php/MaxMind/Db/Reader/autoload.php \
+  %{_bindir}/phpunit9 \
     --verbose || ret=1
 %endif
 exit $ret
@@ -228,6 +234,10 @@ exit $ret
 
 
 %changelog
+* Fri Sep 11 2026 Remi Collet <remi@remirepo.net> - 1.14.0-1
+- update to 1.14.0
+- switch to phpunit9
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index dc1dae0..9647bfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-maxminddb-1.13.1-2194f58.tgz) = 4862dd4afcb899fabd91dfa6a6471aa5bf06f2a4b1c5929d68ad72774c8d83e3ea17f2e2bab557b2d27f7fe2267854c391e19443f52e3667ce04614f3e9cf8d0
+SHA512 (php-maxminddb-1.14.0.tgz) = 3b28ee4db1e440a1ab49c9bb5590363dbbb31c456b2e8541fbd1a3b915dfb1b35c37ebb9d2b693fc95f9ea2b8e7fa5a85c7a4e078042fba0a2ae7a2e7b203364