diff options
| -rw-r--r-- | php-pecl-geospatial.spec | 47 | ||||
| -rw-r--r-- | tests.patch | 73 |
2 files changed, 23 insertions, 97 deletions
diff --git a/php-pecl-geospatial.spec b/php-pecl-geospatial.spec index f3825e6..073e6e3 100644 --- a/php-pecl-geospatial.spec +++ b/php-pecl-geospatial.spec @@ -8,35 +8,32 @@ # %{?scl:%scl_package php-pecl-geospatial} -%global pie_vend php-geospatial -%global pie_proj geospatial -%global gh_commit 6cd0365f9f89a22131755a6c60daa92473ecb4c3 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner php-geospatial -%global gh_project geospatial -#global gh_date 20150908 -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} -%global pecl_name geospatial -%global ini_name 40-%{pecl_name}.ini -%global sources %{gh_project}-%{gh_commit} -%global _configure ../%{sources}/configure +%global pie_vend php-geospatial +%global pie_proj geospatial +%global upstream_version 0.3.5 +#global upstream_prever RC1 +%global gh_owner php-geospatial +%global gh_project geospatial +%global forgeurl https://github.com/%{gh_owner}/%{gh_project} +#global commit b3ae87353da524f33374ee0418ad48f704bb6af1 +%global tag %{upstream_version}%{?upstream_prever} +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global pecl_name geospatial +%global ini_name 40-%{pecl_name}.ini +%global sources %{gh_project}-%{upstream_version}%{?upstream_prever} +%global _configure ../%{sources}/configure %bcond_without tests Summary: PHP Extension to handle common geospatial functions Name: %{?scl_prefix}php-pecl-%{pecl_name} -Version: 0.3.3 -%if 0%{?gh_date:1} -Release: 0.11.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -%else +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +%forgemeta Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} -%endif License: PHP-3.01 URL: https://pecl.php.net/package/%{pecl_name} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz - -Patch0: tests.patch +Source0: %{forgesource} BuildRequires: make BuildRequires: %{?dtsprefix}gcc @@ -76,12 +73,10 @@ mv %{sources}/package.xml . sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml cd %{sources} -%patch -P0 -p1 - # Check version as upstream often forget to update this extver=$(sed -n '/#define PHP_GEOSPATIAL_VERSION/{s/.* "//;s/".*$//;p}' php_geospatial.h) -if test "x${extver}" != "x%{version}%{?prever}%{?gh_date:-dev}"; then - : Error: Upstream version is ${extver}, expecting %{version}%{?prever}%{?gh_date:-dev}. +if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then + : Error: Upstream version is ${extver}, expecting %{upstream_version}%{?upstream_prever}. exit 1 fi cd .. @@ -199,6 +194,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Tue Jul 1 2025 Remi Collet <remi@remirepo.net> - 0.3.5-1 +- update to 0.3.5 +- drop patch merged upstream + * Thu Jun 19 2025 Remi Collet <remi@remirepo.net> - 0.3.3-1 - update to 0.3.3 - drop patch merged upstream diff --git a/tests.patch b/tests.patch deleted file mode 100644 index 42ddba7..0000000 --- a/tests.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 59826af88d8e41f56dadcf9cd83af83d87698401 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Thu, 19 Jun 2025 15:55:09 +0200 -Subject: [PATCH] relax new test for aarch64 - ---- - tests/interpolate-line-string-001.phpt | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/tests/interpolate-line-string-001.phpt b/tests/interpolate-line-string-001.phpt -index 50292f3..d372595 100644 ---- a/tests/interpolate-line-string-001.phpt -+++ b/tests/interpolate-line-string-001.phpt -@@ -32,9 +32,9 @@ array(26) { - [2]=> - array(2) { - [0]=> -- float(11.000073920872426) -+ float(11.0000739208724%d) - [1]=> -- float(10.035925156338873) -+ float(10.0359251563388%d) - } - [3]=> - array(2) { -@@ -55,7 +55,7 @@ array(26) { - [0]=> - float(14.431497984318062) - [1]=> -- float(7.0743500242581225) -+ float(7.07435002425812%d) - } - [6]=> - array(2) { -@@ -74,9 +74,9 @@ array(26) { - [8]=> - array(2) { - [0]=> -- float(12.756998952507347) -+ float(12.7569989525073%d) - [1]=> -- float(-1.7055449208364544) -+ float(-1.70554492083645%d) - } - [9]=> - array(2) { -@@ -95,9 +95,9 @@ array(26) { - [11]=> - array(2) { - [0]=> -- float(11.067030621797189) -+ float(11.0670306217971%d) - [1]=> -- float(-10.483970622513857) -+ float(-10.4839706225138%d) - } - [12]=> - array(2) { -@@ -125,12 +125,12 @@ array(26) { - [0]=> - float(8.642194115015831) - [1]=> -- float(-22.172231059691807) -+ float(-22.1722310596918%d) - } - [16]=> - array(2) { - [0]=> -- float(7.979717846837639) -+ float(7.9797178468376%d) - [1]=> - float(-25.08894018486976) - } |