drop pear/pecl dependency

sources from github

2 files changed, 28 insertions, 27 deletions

diff --git a/REFLECTION b/REFLECTION
index 1e51781..1fa4927 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #138 ds version 1.6.0 ] {
+Extension [ <persistent> extension #148 ds version 1.6.0 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
diff --git a/php-pecl-ds.spec b/php-pecl-ds.spec
index 8ae58ac..5d2f9e6 100644
--- a/php-pecl-ds.spec
+++ b/php-pecl-ds.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-ds
 #
-# SPDX-FileCopyrightText:  Copyright 2016-2025 Remi Collet
+# SPDX-FileCopyrightText:  Copyright 2016-2026 Remi Collet
 # SPDX-License-Identifier: CECILL-2.1
 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
@@ -21,27 +21,34 @@
 %global pie_proj     ext-ds
 # After json
 %global ini_name     40-%{pecl_name}.ini
-%global sources      %{pecl_name}-%{version}
+%global sources      %{gh_proj}-%{version}
 %global _configure   ../%{sources}/configure
 
+
+# Github forge
+%global gh_vend      php-ds
+%global gh_proj      ext-ds
+%global forgeurl0    https://github.com/%{gh_vend}/%{gh_proj}
+%global tag0         v%{version}
+# for EL-8 to avoid TAG usage
+%global archivename0 %{gh_proj}-%{version}
+
 # For test suite, see https://github.com/php-ds/tests/commits/master
 # version 1.5.1  (version 1.6.0 exist but requires phpunit12, so PHP 8.3)
-%global gh_commit    3d14aa6f8c25d38d79c90924150c51636544e4a8
-%global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner     php-ds
-%global gh_project   tests
+%global forgeurl1    https://github.com/%{gh_vend}/tests
+%global tag1         v1.5.1
+%global archivename1 tests-1.5.1
 
 
 Summary:        Data Structures for PHP
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-Version:        1.6.0
-Release:        3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        MIT
-URL:            https://pecl.php.net/package/%{pecl_name}
-Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-# Only use for tests during the build, no value to be packaged separately
-# in composer.json:  "require-dev": {  "php-ds/tests": "^1.5.0" }
-Source1:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{gh_short}.tar.gz
+Version:        1.6.0
+Release:        4%{?dist}
+%forgemeta -a
+URL:            %{forgeurl}
+Source0:        %{forgesource0}
+Source1:        %{forgesource1}
 
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
@@ -80,10 +87,7 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -c -a 1
-mv %{gh_project}-%{gh_commit} tests
-
-# Don't install/register tests, install examples as doc
-sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
+mv %{archivename1} tests
 
 cd %{sources}
 # Sanity check, really often broken
@@ -138,20 +142,12 @@ peclbuild %{__ztsphpconfig}
 # install config file
 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
-
 %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 install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
-
 
 %check
 [ -f %{php_extdir}/json.so ] && modules="-d extension=json.so"
@@ -188,7 +184,8 @@ done
 
 %files
 %license %{sources}/LICENSE
-%{pecl_xmldir}/%{name}.xml
+%doc %{sources}/composer.json
+%doc %{sources}/*.md
 
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
@@ -200,6 +197,10 @@ done
 
 
 %changelog
+* Fri Mar 13 2026 Remi Collet <remi@remirepo.net> - 1.6.0-4
+- drop pear/pecl dependency
+- sources from github
+
 * Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 1.6.0-3
 - rebuild for PHP 8.5.0RC1