drop pear/pecl dependencyHEADmaster

3 files changed, 22 insertions, 45 deletions

diff --git a/PHPINFO b/PHPINFO
index 52c3c2b..1711756 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,4 +2,4 @@
 geospatial
 
 Geospatial functions => enabled
-Version => 0.3.3
+Version => 0.3.5
diff --git a/REFLECTION b/REFLECTION
index 399c321..23288d1 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,10 +1,10 @@
-Extension [ <persistent> extension #83 geospatial version 0.3.3 ] {
+Extension [ <persistent> extension #84 geospatial version 0.3.5 ] {
 
   - Constants [4] {
-    Constant [ float GEO_DEG_TO_RAD ] { 0.017453292519943 }
-    Constant [ float GEO_EARTH_RADIUS ] { 6378137 }
-    Constant [ int GEO_AIRY_1830 ] { 2 }
-    Constant [ int GEO_WGS84 ] { 1 }
+    Constant [ <persistent> float GEO_DEG_TO_RAD ] { 0.017453292519943 }
+    Constant [ <persistent> float GEO_EARTH_RADIUS ] { 6378137 }
+    Constant [ <persistent> int GEO_AIRY_1830 ] { 2 }
+    Constant [ <persistent> int GEO_WGS84 ] { 1 }
   }
 
   - Functions {
diff --git a/php-pecl-geospatial.spec b/php-pecl-geospatial.spec
index 073e6e3..092498a 100644
--- a/php-pecl-geospatial.spec
+++ b/php-pecl-geospatial.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-geospatial
 #
-# SPDX-FileCopyrightText:  Copyright 2015-2025 Remi Collet
+# SPDX-FileCopyrightText:  Copyright 2015-2026 Remi Collet
 # SPDX-License-Identifier: CECILL-2.1
 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
@@ -15,30 +15,26 @@
 %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
+%global _configure       ../configure
 
 %bcond_without  tests
 
-Summary:        PHP Extension to handle common geospatial functions
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
+Summary:        PHP Extension to handle common geospatial functions
+License:        PHP-3.01
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release:        2%{?dist}
 %forgemeta
-Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-
-License:        PHP-3.01
-URL:            https://pecl.php.net/package/%{pecl_name}
+URL:            %{forgeurl}
 Source0:        %{forgesource}
 
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-devel >= 8.0
-BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-json
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
@@ -46,10 +42,13 @@ Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 
 # Package have be renamed
 Obsoletes:      %{?scl_prefix}php-%{pecl_name}                 < %{version}
+# Extension
 Provides:       %{?scl_prefix}php-%{pecl_name}                 = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}         = %{version}
+# PECL
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})           = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa}   = %{version}
+# PIE
 Provides:       %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
 Provides:       %{?scl_prefix}php-%{pie_vend}-%{pie_proj}      = %{version}
 
@@ -67,19 +66,14 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 
 %prep
-%setup -qc
-mv %{sources}/package.xml .
-
-sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
+%forgesetup
 
-cd %{sources}
 # 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%{upstream_version}%{?upstream_prever}"; then
    : Error: Upstream version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
    exit 1
 fi
-cd ..
 
 # Drop in the bit of configuration
 cat << 'EOF' | tee %{ini_name}
@@ -101,12 +95,11 @@ peclconf() {
     --with-php-config=$1
 }
 
-cd %{sources}
 %{__phpize}
 [ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global
 sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL
 
-cd ../NTS
+cd NTS
 peclconf %{__phpconfig}
 %make_build
 
@@ -124,23 +117,14 @@ peclconf %{__ztsphpconfig}
 %make_install -C NTS
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
-# Install XML package description
-install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
 # Install the ZTS stuff
 %if %{with_zts}
 %make_install -C ZTS
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
-# Documentation
-for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do [ -f NTS/$i ] &&  install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
-
 
 %check
-cd %{sources}
 
 OPT="-n"
 if [ -f %{php_extdir}/json.so ]; then
@@ -167,22 +151,12 @@ REPORT_EXIT_STATUS=1 \
 %{__ztsphp} --no-php-ini \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
-
-%if %{with tests}
-: Upstream test suite for ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
-TEST_PHP_ARGS="$OPT -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php -q --show-diff
-%else
-: Upstream test suite disabled
-%endif
 %endif
 
 
 %files
-%license %{sources}/LICENSE
-%{pecl_xmldir}/%{name}.xml
+%license LICENSE
+%doc README.rst
 
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
@@ -194,6 +168,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Thu Apr 23 2026 Remi Collet <remi@remirepo.net> - 0.3.5-2
+- drop pear/pecl dependency
+
 * Tue Jul  1 2025 Remi Collet <remi@remirepo.net> - 0.3.5-1
 - update to 0.3.5
 - drop patch merged upstream