diff options
Diffstat (limited to 'php-geos.spec')
| -rw-r--r-- | php-geos.spec | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/php-geos.spec b/php-geos.spec index 88ebbc1..c9d5a93 100644 --- a/php-geos.spec +++ b/php-geos.spec @@ -1,11 +1,14 @@ # remirepo spec file for php-geos # -# Copyright (c) 2016-2018 Remi Collet +# Copyright (c) 2016-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # + +%bcond_without tests + %if 0%{?scl:1} %global sub_prefix %{scl_prefix} %scl_package php-geos @@ -20,11 +23,10 @@ %else %global ini_name 40-%{pecl_name}.ini %endif -%global with_tests 0%{!?_without_tests:1} Name: %{?sub_prefix}php-%{pecl_name} Version: 1.0.0 -Release: 11%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 17%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP module for GEOS @@ -37,6 +39,10 @@ Source0: https://git.osgeo.org/gogs/geos/php-geos/archive/%{version}%{?pr # https://git.osgeo.org/gitea/geos/php-geos/issues/20 Patch0: 0001-fix-test-for-7.3-int-vs-integer.patch Patch1: 0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch +# https://git.osgeo.org/gitea/geos/php-geos/issues/24 +Patch2: 0003-add-all-arginfo-and-fix-build-with-PHP-8.patch +# https://git.osgeo.org/gitea/geos/php-geos/issues/25 +Patch3: 0004-fix-all-zend_parse_parameters-call-to-use-zend_long.patch BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel @@ -57,27 +63,19 @@ 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 "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -%if "%{php_version}" > "5.6" -Obsoletes: php56u-%{pecl_name} <= %{version} -Obsoletes: php56w-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.0" -Obsoletes: php70u-%{pecl_name} <= %{version} -Obsoletes: php70w-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "7.1" -Obsoletes: php71u-%{pecl_name} <= %{version} -Obsoletes: php71w-%{pecl_name} <= %{version} -%endif %if "%{php_version}" > "7.2" Obsoletes: php72u-%{pecl_name} <= %{version} -Obsoletes: php72w-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "7.3" -Obsoletes: php73u-%{pecl_name} <= %{version} -Obsoletes: php73w-%{pecl_name} <= %{version} +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 @@ -99,8 +97,11 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{pkg_name} NTS cd NTS +chmod -x *.c %patch0 -p1 -b .test %patch1 -p1 -b .wformat +%patch2 -p1 -b .arginfo +%patch3 -p1 -b .zendlong sed -e '/PHP_GEOS_VERSION/s/"0.0"/"%{version}%{?prever}"/' -i php_geos.h @@ -167,7 +168,13 @@ install -Dpm 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} --modules | grep %{pecl_name} %endif -%if %{with_tests} +%if %{with tests} +%if 0%{?fedora} >= 32 +# See https://git.osgeo.org/gitea/geos/php-geos/issues/23 +# ignore failing test with geos 3.8 +rm ?TS/tests/001_Geometry.phpt +%endif + cd NTS : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ @@ -205,6 +212,16 @@ exit $ret %changelog +* Wed Sep 2 2020 Remi Collet <remi@remirepo.net> - 1.0.0-17 +- rebuild for PHP 8.0.0beta3 + +* Fri Aug 28 2020 Remi Collet <remi@remirepo.net> - 1.0.0-16 +- oprn https://git.osgeo.org/gitea/geos/php-geos/issues/24 missing arginfo +- open https://git.osgeo.org/gitea/geos/php-geos/issues/25 zend_long usage + +* Thu Aug 20 2020 Remi Collet <remi@remirepo.net> - 1.0.0-15 +- ignore 1 test failing with geos 3.8 + * Thu Aug 16 2018 Remi Collet <remi@remirepo.net> - 1.0.0-11 - rebuild for 7.3.0beta2 new ABI |