public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/php-maxminddb] epel10: update to 1.14.0
@ 2026-09-11  8:39 Remi Collet
  0 siblings, 0 replies; only message in thread
From: Remi Collet @ 2026-09-11  8:39 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/php-maxminddb
            Branch : epel10
            Commit : 1ad7fb60efaf3a8266454a1c6e86aaf6c4399a1a
            Author : Remi Collet <remi@fedoraproject.org>
            Date   : 2026-09-11T10:39:40+02:00
            Stats  : +43/-37 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/php-maxminddb/c/1ad7fb60efaf3a8266454a1c6e86aaf6c4399a1a?branch=epel10

            Log:
            update to 1.14.0

switch to phpunit9
drop pear/pecl dependency
add pie virtual provides

---
diff --git a/.gitignore b/.gitignore
index 89fe537..d8593fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ clog
 /php-maxminddb-1.12.0-5b2d7a7.tgz
 /php-maxminddb-1.12.1-815939e.tgz
 /php-maxminddb-1.13.0-b298986.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 a2fec59..7236713 100644
--- a/php-maxminddb.spec
+++ b/php-maxminddb.spec
@@ -3,17 +3,17 @@
 #
 # remirepo spec file for php-maxminddb
 #
-# SPDX-FileCopyrightText:  Copyright 2018-2025 Remi Collet
+# SPDX-FileCopyrightText:  Copyright 2018-2026 Remi Collet
 # SPDX-License-Identifier: CECILL-2.1
 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit   b298986c4f2c75ff080d9f6f4839bec46bda70f3
-%global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    maxmind
 %global gh_project  MaxMind-DB-Reader-php
 # Extension
+%global pie_vend    maxmind-db
+%global pie_proj    reader-ext
 %global pecl_name   maxminddb
 %global ini_name    40-%{pecl_name}.ini
 # pure PHP library
@@ -22,27 +22,29 @@
 %global _configure   ../ext/configure
 
 %if 0%{?fedora}
+# Option to disable library tests (phpunit)
+# Extension is always tested
 %bcond_without       tests
 %else
 %bcond_with          tests
 %endif
 
-Summary:       MaxMind DB Reader extension
 Name:          php-maxminddb
-Version:       1.13.0
-Release:       1%{?dist}
+Summary:       MaxMind DB Reader extension
 License:       Apache-2.0
+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
-BuildRequires: php-pear  >= 1.10
+# Ensure default PHP 8.3 on EPEL-10
+BuildRequires: (php-devel >= 8.3 with php-devel < 8.4)
 BuildRequires: pkgconfig(libmaxminddb) >= 1.0.0
 
 Requires:      php(zend-abi) = %{php_zend_api}
@@ -57,6 +59,9 @@ Provides:       php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:       php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 Provides:       php-pecl(%{pecl_name})         = %{version}
 Provides:       php-pecl(%{pecl_name})%{?_isa} = %{version}
+# PIE
+Provides:       %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
+Provides:       %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version}
 
 
 %description
@@ -83,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": {
@@ -97,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
@@ -126,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 \
@@ -165,9 +171,6 @@ sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global
 : Install the extension
 %make_install -C ext
 
-: Install XML package description
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
 : Install the extension
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
@@ -192,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
@@ -213,7 +220,6 @@ exit $ret
 %files
 %license LICENSE
 %doc *.md
-%{pecl_xmldir}/%{name}.xml
 
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
@@ -228,6 +234,12 @@ exit $ret
 
 
 %changelog
+* Fri Sep 11 2026 Remi Collet <remi@remirepo.net> - 1.14.0-1
+- update to 1.14.0
+- switch to phpunit9
+- drop pear/pecl dependency
+- add pie virtual provides
+
 * Fri Nov 21 2025 Remi Collet <remi@remirepo.net> - 1.13.0-1
 - update to 1.13.0
 

diff --git a/sources b/sources
index c7ba67a..9647bfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-maxminddb-1.13.0-b298986.tgz) = c506564948c4a8766cd7b5241af5897c82fc85806eb9d9aa64d6625fc51fefecabd1314396690c806ac2ecd0e489ad54ba27812e04cf04c93b1d1f0d27777ca5
+SHA512 (php-maxminddb-1.14.0.tgz) = 3b28ee4db1e440a1ab49c9bb5590363dbbb31c456b2e8541fbd1a3b915dfb1b35c37ebb9d2b693fc95f9ea2b8e7fa5a85c7a4e078042fba0a2ae7a2e7b203364

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-11  8:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-11  8:39 [rpms/php-maxminddb] epel10: update to 1.14.0 Remi Collet

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox