Compare commits

...
Sign in to create a new pull request.

9 commits

Author SHA1 Message Date
Remi Collet
f99edb7aaa update to 1.13.1 (no changes)
add pie virtual provides
2025-11-22 08:22:12 +01:00
Remi Collet
391aaa7bf4 v1.13.0 2025-11-21 08:41:06 +01:00
Remi Collet
fa67c8ab38 rebuild for https://fedoraproject.org/wiki/Changes/php85 2025-09-17 07:16:20 +02:00
Fedora Release Engineering
839b59ea2d Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 05:14:46 +00:00
Remi Collet
d0009e4dd9 update to 1.12.1
re-license spec file to CECILL-2.1
2025-05-06 08:43:25 +02:00
Fedora Release Engineering
7e36bf7aea Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-18 09:09:16 +00:00
Remi Collet
98b460f37c v1.12.0 2024-11-15 08:28:29 +01:00
Remi Collet
2e8fa899d7 modernize the spec file 2024-10-18 15:53:12 +02:00
Remi Collet
06060b8954 rebuild for https://fedoraproject.org/wiki/Changes/php84 2024-10-14 12:10:04 +02:00
3 changed files with 54 additions and 51 deletions

4
.gitignore vendored
View file

@ -10,3 +10,7 @@ clog
/php-maxminddb-1.10.1-569bd44.tgz /php-maxminddb-1.10.1-569bd44.tgz
/php-maxminddb-1.11.0-f7cc1a1.tgz /php-maxminddb-1.11.0-f7cc1a1.tgz
/php-maxminddb-1.11.1-1e66f73.tgz /php-maxminddb-1.11.1-1e66f73.tgz
/php-maxminddb-1.12.0-5b2d7a7.tgz
/php-maxminddb-1.12.1-815939e.tgz
/php-maxminddb-1.13.0-b298986.tgz
/php-maxminddb-1.13.1-2194f58.tgz

View file

@ -3,19 +3,20 @@
# #
# remirepo spec file for php-maxminddb # remirepo spec file for php-maxminddb
# #
# Copyright (c) 2018-2024 Remi Collet # SPDX-FileCopyrightText: Copyright 2018-2025 Remi Collet
# License: CC-BY-SA-4.0 # SPDX-License-Identifier: CECILL-2.1
# http://creativecommons.org/licenses/by-sa/4.0/ # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
# #
# Please, preserve the changelog entries # Please, preserve the changelog entries
# #
%global gh_commit 1e66f73ffcf25e17c7a910a1317e9720a95497c7 %global gh_commit 2194f58d0f024ce923e685cdf92af3daf9951908
%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner maxmind %global gh_owner maxmind
%global gh_project MaxMind-DB-Reader-php %global gh_project MaxMind-DB-Reader-php
# Extension # Extension
%global pie_vend maxmind-db
%global pie_proj reader-ext
%global pecl_name maxminddb %global pecl_name maxminddb
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
%global ini_name 40-%{pecl_name}.ini %global ini_name 40-%{pecl_name}.ini
# pure PHP library # pure PHP library
%global pk_vendor maxmind-db %global pk_vendor maxmind-db
@ -30,8 +31,8 @@
Summary: MaxMind DB Reader extension Summary: MaxMind DB Reader extension
Name: php-maxminddb Name: php-maxminddb
Version: 1.11.1 Version: 1.13.1
Release: 5%{?dist} Release: 1%{?dist}
License: Apache-2.0 License: Apache-2.0
URL: https://github.com/%{gh_owner}/%{gh_project} URL: https://github.com/%{gh_owner}/%{gh_project}
@ -58,6 +59,9 @@ Provides: php-pecl-%{pecl_name} = %{version}-%{release}
Provides: php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} Provides: php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
Provides: php-pecl(%{pecl_name}) = %{version} Provides: php-pecl(%{pecl_name}) = %{version}
Provides: php-pecl(%{pecl_name})%{?_isa} = %{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 %description
@ -142,11 +146,6 @@ if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
fi fi
cd .. cd ..
mkdir NTS
%if %{with_zts}
mkdir ZTS
%endif
# Drop in the bit of configuration # Drop in the bit of configuration
cat << 'EOF' | tee %{ini_name} cat << 'EOF' | tee %{ini_name}
; Enable '%{pecl_name}' extension module ; Enable '%{pecl_name}' extension module
@ -157,38 +156,27 @@ EOF
%build %build
cd ext cd ext
%{__phpize} %{__phpize}
sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global
cd ../NTS
%configure \ %configure \
--with-php-config=%{__phpconfig} \ --with-php-config=%{__phpconfig} \
--with-libdir=%{_lib} \ --with-libdir=%{_lib} \
--with-maxminddb --with-maxminddb
make %{?_smp_mflags}
%if %{with_zts} %make_build
cd ../ZTS
%configure \
--with-php-config=%{__ztsphpconfig} \
--with-libdir=%{_lib} \
--with-maxminddb
make %{?_smp_mflags}
%endif
%install %install
# Install XML package description : Install the extension
%make_install -C ext
: Install XML package description
install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
# Install the NTS stuff : Install the extension
make -C NTS install INSTALL_ROOT=%{buildroot}
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
%if %{with_zts} : Install the library
# Install the ZTS stuff
make -C ZTS install INSTALL_ROOT=%{buildroot}
install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
mkdir -p %{buildroot}%{_datadir}/php/MaxMind mkdir -p %{buildroot}%{_datadir}/php/MaxMind
cp -pr src/MaxMind/Db %{buildroot}%{_datadir}/php/MaxMind/Db cp -pr src/MaxMind/Db %{buildroot}%{_datadir}/php/MaxMind/Db
@ -199,12 +187,6 @@ cp -pr src/MaxMind/Db %{buildroot}%{_datadir}/php/MaxMind/Db
--define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
--modules | grep '^%{pecl_name}$' --modules | grep '^%{pecl_name}$'
%if %{with_zts}
: Minimal load test for ZTS extension
%{__ztsphp} --no-php-ini \
--define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
--modules | grep '^%{pecl_name}$'
%endif
ret=0 ret=0
cd ext cd ext
@ -213,17 +195,10 @@ TEST_PHP_EXECUTABLE=%{__php} \
TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
%{__php} -n run-tests.php -q --show-diff || ret=1 %{__php} -n run-tests.php -q --show-diff || ret=1
%if %{with_zts}
: Upstream test suite for ZTS extension
TEST_PHP_EXECUTABLE=%{__ztsphp} \
TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
%{__ztsphp} -n run-tests.php -q --show-diff || ret=1
%endif
%if %{with tests} %if %{with tests}
cd .. cd ..
: Upstream test suite for the library : Upstream test suite for the library
for cmd in php php80 php81 php82 php83; do for cmd in php80 php81 php82 php83 php84; do
if which $cmd; then if which $cmd; then
$cmd %{_bindir}/phpunit8 \ $cmd %{_bindir}/phpunit8 \
--bootstrap %{buildroot}%{_datadir}/php/MaxMind/Db/Reader/autoload.php \ --bootstrap %{buildroot}%{_datadir}/php/MaxMind/Db/Reader/autoload.php \
@ -248,11 +223,6 @@ exit $ret
%config(noreplace) %{php_inidir}/%{ini_name} %config(noreplace) %{php_inidir}/%{ini_name}
%{php_extdir}/%{pecl_name}.so %{php_extdir}/%{pecl_name}.so
%if %{with_zts}
%config(noreplace) %{php_ztsinidir}/%{ini_name}
%{php_ztsextdir}/%{pecl_name}.so
%endif
%files -n php-%{pk_vendor}-%{pk_project} %files -n php-%{pk_vendor}-%{pk_project}
%license LICENSE %license LICENSE
@ -263,6 +233,35 @@ exit $ret
%changelog %changelog
* Sat Nov 22 2025 Remi Collet <remi@remirepo.net> - 1.13.1-1
- update to 1.13.1 (no changes)
- add pie virtual provides
* Fri Nov 21 2025 Remi Collet <remi@remirepo.net> - 1.13.0-1
- update to 1.13.0
* Wed Sep 17 2025 Remi Collet <remi@remirepo.net> - 1.12.1-3
- rebuild for https://fedoraproject.org/wiki/Changes/php85
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue May 6 2025 Remi Collet <remi@remirepo.net> - 1.12.1-1
- update to 1.12.1
- re-license spec file to CECILL-2.1
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Nov 15 2024 Remi Collet <remi@remirepo.net> - 1.12.0-1
- update to 1.12.0
* Fri Oct 18 2024 Remi Collet <remi@fedoraproject.org> - 1.11.1-7
- modernize the spec file
* Mon Oct 14 2024 Remi Collet <remi@fedoraproject.org> - 1.11.1-6
- rebuild for https://fedoraproject.org/wiki/Changes/php84
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-5 * Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

View file

@ -1 +1 @@
SHA512 (php-maxminddb-1.11.1-1e66f73.tgz) = 4d38bfca7b3b215ce01e306be1c3771dec9c83728026915faa98c6e51595181ade29ede6709fd71a22439cad23c808a55c0d459c6c56eb4638d8378bb34a4106 SHA512 (php-maxminddb-1.13.1-2194f58.tgz) = 4862dd4afcb899fabd91dfa6a6471aa5bf06f2a4b1c5929d68ad72774c8d83e3ea17f2e2bab557b2d27f7fe2267854c391e19443f52e3667ce04614f3e9cf8d0