diff options
| author | Remi Collet <remi@remirepo.net> | 2020-09-30 09:21:29 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-09-30 09:21:29 +0200 |
| commit | 51ad923a4c59803471693fedab77f51fabd231b5 (patch) | |
| tree | d305dae5f208b209e7e6e405f0af65c57ee62ce5 | |
| parent | 8e4c85671c2cb794b7f35e3029d98d973a612cd4 (diff) | |
rebuild for PHP 8.0.0RC1
| -rw-r--r-- | 0005-fix-for-8.0.0RC1.patch | 25 | ||||
| -rw-r--r-- | php-geos.spec | 7 |
2 files changed, 31 insertions, 1 deletions
diff --git a/0005-fix-for-8.0.0RC1.patch b/0005-fix-for-8.0.0RC1.patch new file mode 100644 index 0000000..9759290 --- /dev/null +++ b/0005-fix-for-8.0.0RC1.patch @@ -0,0 +1,25 @@ +From 37ede013e720aed2ab4e7ce33699a86dd0ef3730 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 30 Sep 2020 09:17:54 +0200 +Subject: [PATCH 5/5] fix for 8.0.0RC1 + +--- + tests/003_WKTReader.phpt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/003_WKTReader.phpt b/tests/003_WKTReader.phpt +index fbd4fb1..e02d1c8 100644 +--- a/tests/003_WKTReader.phpt ++++ b/tests/003_WKTReader.phpt +@@ -100,7 +100,7 @@ class WKTReaderTest extends GEOSTest + $this->assertContains('expects exactly 1 parameter', + $e->getMessage()); + } catch (Error $e) { +- $this->assertContains('expects exactly 1 parameter', $e->getMessage()); ++ $this->assertContains('expects exactly 1', $e->getMessage()); + } + } + } +-- +2.25.4 + diff --git a/php-geos.spec b/php-geos.spec index c9d5a93..ee046df 100644 --- a/php-geos.spec +++ b/php-geos.spec @@ -26,7 +26,7 @@ Name: %{?sub_prefix}php-%{pecl_name} Version: 1.0.0 -Release: 17%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 18%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Summary: PHP module for GEOS @@ -41,6 +41,7 @@ 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 +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 @@ -102,6 +103,7 @@ chmod -x *.c %patch1 -p1 -b .wformat %patch2 -p1 -b .arginfo %patch3 -p1 -b .zendlong +%patch4 -p1 -b .arg sed -e '/PHP_GEOS_VERSION/s/"0.0"/"%{version}%{?prever}"/' -i php_geos.h @@ -212,6 +214,9 @@ exit $ret %changelog +* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.0.0-18 +- rebuild for PHP 8.0.0RC1 + * Wed Sep 2 2020 Remi Collet <remi@remirepo.net> - 1.0.0-17 - rebuild for PHP 8.0.0beta3 |