From 1c5d7d01f3610ba9cdfd0b6d63efb06752dbcd46 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 May 2026 15:39:52 +0200 Subject: cleanups for review --- php-rlerdorf-geoip.spec | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/php-rlerdorf-geoip.spec b/php-rlerdorf-geoip.spec index 47d9d66..98b28b7 100644 --- a/php-rlerdorf-geoip.spec +++ b/php-rlerdorf-geoip.spec @@ -1,3 +1,6 @@ +# Fedora spec file for php-rlerdorf-geoip +# without SCL compatibility from: +# # remirepo spec file for php-rlerdorf-geoip # # SPDX-FileCopyrightText: Copyright 2026 Remi Collet @@ -7,8 +10,6 @@ # Please, preserve the changelog entries # -%{?scl:%scl_package php-rlerdorf-geoip} - %bcond_without tests # Extension @@ -25,7 +26,7 @@ %global forgeurl https://github.com/%{gh_vend}/%{gh_proj} %global tag %{upstream_version}%{?upstream_prever} -Name: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} +Name: php-%{pie_vend}-%{pie_proj} Summary: Legacy GeoIP (v1) PHP extension License: PHP-3.01 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} @@ -34,33 +35,31 @@ Release: 1%{?dist} URL: %{forgeurl} Source0: %{forgesource} -Patch0: 0001-Fix-compatibility-with-PHP-7.patch - BuildRequires: make BuildRequires: gcc -BuildRequires: %{?scl_prefix}php-devel >= 7.2 +BuildRequires: php-devel >= 7.2 BuildRequires: GeoIP-devel -Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} -Requires: %{?scl_prefix}php(api) = %{php_core_api} +Requires: php(zend-abi) = %{php_zend_api} +Requires: php(api) = %{php_core_api} # Extension -Provides: %{?scl_prefix}php-%{ext_name} = %{version} -Provides: %{?scl_prefix}php-%{ext_name}%{?_isa} = %{version} +Provides: php-%{ext_name} = %{version} +Provides: php-%{ext_name}%{?_isa} = %{version} # PIE -Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: php-pie(%{pie_vend}/%{pie_proj}) = %{version} # Package is a fork with same API -Obsoletes: %{?scl_prefix}php-pecl-%{ext_name} < 1.2 -Provides: %{?scl_prefix}php-pecl-%{ext_name} = %{version} -Provides: %{?scl_prefix}php-pecl-%{ext_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +Obsoletes: php-pecl-%{ext_name} < 1.2 +Provides: php-pecl-%{ext_name} = %{version} +Provides: php-pecl-%{ext_name}%{?_isa} = %{version} +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} %description This is the legacy (v1) GeoIP PHP extension for PHP 7.2+ and PHP 8.x. -Unless you have old code that needs this, you might be better off using +Unless you have old code that needs this, you might be better off, using - php-maxmind-db-reader library (maxmind-db/reader) - php-maxminddb extension (maxmind-db/reader-ext) @@ -69,7 +68,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %forgesetup -%patch -P0 -p1 -b .pr7 : Sanity check, really often broken extver=$(sed -n '/#define PHP_GEOIP_VERSION/{s/.* "//;s/".*$//;p}' php_geoip.h) @@ -87,8 +85,7 @@ EOF %build %{__phpize} -[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global -sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global %configure \ --with-geoip \ @@ -130,5 +127,3 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_extdir}/%{ext_name}.so" \ * Thu Apr 23 2026 Remi Collet - 1.4.0-1 - initial package - obsoletes php-pecl-geoip -- fix compatibility with PHP 7 using patch from - https://github.com/rlerdorf/geoip/pull/7 -- cgit