From a5a75b01ded27214ce6dd1e066fc7009d16bc86b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 1 Jul 2025 13:56:59 +0200 Subject: update to 0.3.5 drop patch merged upstream --- php-pecl-geospatial.spec | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) (limited to 'php-pecl-geospatial.spec') 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 - 0.3.5-1 +- update to 0.3.5 +- drop patch merged upstream + * Thu Jun 19 2025 Remi Collet - 0.3.3-1 - update to 0.3.3 - drop patch merged upstream -- cgit