diff options
Diffstat (limited to 'php-geos.spec')
| -rw-r--r-- | php-geos.spec | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/php-geos.spec b/php-geos.spec index 4ea528f..db30d68 100644 --- a/php-geos.spec +++ b/php-geos.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-geos # -# Copyright (c) 2016-2020 Remi Collet +# Copyright (c) 2016-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,7 +10,6 @@ %bcond_without tests %if 0%{?scl:1} -%global sub_prefix %{scl_prefix} %scl_package php-geos %else %global pkg_name php-geos @@ -24,9 +23,9 @@ %global ini_name 40-%{pecl_name}.ini %endif -Name: %{?sub_prefix}php-%{pecl_name} +Name: %{?scl_prefix}php-%{pecl_name} Version: 1.0.0 -Release: 23%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 24%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP module for GEOS @@ -44,6 +43,8 @@ Patch2: 0003-add-all-arginfo-and-fix-build-with-PHP-8.patch Patch4: 0005-fix-for-8.0.0RC1.patch # https://git.osgeo.org/gitea/geos/php-geos/issues/25 Patch3: 0004-fix-all-zend_parse_parameters-call-to-use-zend_long.patch +# https://git.osgeo.org/gitea/geos/php-geos/issues/27 +Patch5: 0006-fix-__toString-with-8.2.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel @@ -55,37 +56,11 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif # Dropped from geos Obsoletes: %{?scl_prefix}geos-php <= 3.5.0 Provides: %{?scl_prefix}geos-php = 1:%{version}-%{release} Provides: %{?scl_prefix}geos-php%{?_isa} = 1:%{version}-%{release} -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} -# Other third party repo stuff -%if "%{php_version}" > "7.2" -Obsoletes: php72u-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.3" -Obsoletes: php73-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.4" -Obsoletes: php74-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "8.0" -Obsoletes: php80-%{pecl_name} <= %{version} -%endif -%endif - -%if 0%{?fedora} < 20 && 0%{?rhel} < 7 -# Filter private shared -%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} -%{?filter_setup} -%endif - %description PHP module for GEOS. @@ -104,6 +79,7 @@ chmod -x *.c %patch2 -p1 -b .arginfo %patch3 -p1 -b .zendlong %patch4 -p1 -b .arg +%patch5 -p1 -b .php82 sed -e '/PHP_GEOS_VERSION/s/"0.0"/"%{version}%{?prever}"/' -i php_geos.h @@ -214,6 +190,10 @@ exit $ret %changelog +* Fri Sep 9 2022 Remi Collet <remi@remirepo.net> - 1.0.0-24 +- add patch for PHP 8.2 from + https://git.osgeo.org/gitea/geos/php-geos/issues/27 + * Fri Nov 5 2021 Remi Collet <remi@remirepo.net> - 1.0.0-23 - EL-9 build |