diff options
Diffstat (limited to 'php-pecl-geoip.spec')
| -rw-r--r-- | php-pecl-geoip.spec | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/php-pecl-geoip.spec b/php-pecl-geoip.spec index 4d1bb5a..651239e 100644 --- a/php-pecl-geoip.spec +++ b/php-pecl-geoip.spec @@ -24,16 +24,17 @@ Name: %{?sub_prefix}php-pecl-geoip Version: 1.1.1 -Release: 14%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 15%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: Extension to map IP addresses to geographic places License: PHP URL: https://pecl.php.net/package/%{pecl_name} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# Upstream patch for PHP 8 -# https://svn.php.net/viewvc?view=revision&revision=351082 +# Upstream patches Patch0: %{pecl_name}-php8.patch +Patch1: %{pecl_name}-php81.patch +BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: GeoIP-devel BuildRequires: %{?scl_prefix}php-devel @@ -86,12 +87,9 @@ Obsoletes: php74-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "8.0" Obsoletes: php80-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "8.1" +Obsoletes: php81-pecl-%{pecl_name} <= %{version} %endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter shared private -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} %endif @@ -115,7 +113,8 @@ sed -e 's/role="test"/role="src"/' \ mv %{pecl_name}-%{version} NTS cd NTS -%patch0 -p3 -b .up +%patch0 -p1 -b .php8 +%patch1 -p1 -b .php81 extver=$(sed -n '/#define PHP_GEOIP_VERSION/{s/.* "//;s/".*$//;p}' php_geoip.h) if test "x${extver}" != "x%{version}"; then @@ -234,6 +233,9 @@ fi %changelog +* Fri Jun 11 2021 Remi Collet <remi@remirepo.net> - 1.1.1-15 +- add upstream patch for PHP 8.1 + * Fri Oct 30 2020 Remi Collet <remi@remirepo.net> - 1.1.1-14 - add upstream patch for PHP 8 |