drop pear/pecl dependencyHEADmaster

sources from github

2 files changed, 52 insertions, 47 deletions

diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..78d2eb6
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "imagick/imagick",
+    "type": "php-ext",
+    "license": "PHP-3.01",
+    "description": "The Imagick PHP extension",
+    "require": {
+        "php": ">= 5.6.0"
+    },
+    "php-ext": {
+        "extension-name": "imagick",
+        "configure-options": [
+            {
+                "name": "with-imagick",
+                "description": "Enables the imagick extension. DIR is the prefix to ImageMagick installation directory.",
+                "needs-value": true
+            }
+        ]
+    }
+}
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index d659e25..8fcbed2 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-imagick
 #
-# SPDX-FileCopyrightText:  Copyright 2008-2025 Remi Collet
+# SPDX-FileCopyrightText:  Copyright 2008-2026 Remi Collet
 # SPDX-License-Identifier: CECILL-2.1
 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
@@ -29,20 +29,22 @@
 %global _root_prefix %{_prefix}
 %endif
 
-%global gh_commit   623a3ac0386c93d62c60cbfe610505f2e35780f3
-%global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner    imagick
-%global gh_project  imagick
-%global pecl_name   imagick
-%global pie_vend    imagick
-%global pie_proj    imagick
-%global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
-%global ini_name    40-%{pecl_name}.ini
+%global pecl_name        imagick
+%global pie_vend         imagick
+%global pie_proj         imagick
+%global with_zts         0%{!?_without_zts:%{?__ztsphp:1}}
+%global ini_name         40-%{pecl_name}.ini
 %global upstream_version 3.8.1
 #global upstream_prever  RC2
 %global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}
 %global _configure       ../%{sources}/configure
 
+# Github forge
+%global gh_vend          Imagick
+%global gh_proj          imagick
+%global forgeurl         https://github.com/%{gh_vend}/%{gh_proj}
+%global tag              %{upstream_version}%{?upstream_prever}
+
 %if %{with im6}
 Summary:       Extension to create and modify images using ImageMagick 6
 Name:          %{?scl_prefix}php-pecl-imagick-im6
@@ -50,16 +52,16 @@ Name:          %{?scl_prefix}php-pecl-imagick-im6
 Summary:       Extension to create and modify images using ImageMagick 7
 Name:          %{?scl_prefix}php-pecl-imagick-im7
 %endif
-Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:       1.8%{?dist}
-Source0:       https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 License:       PHP-3.01
-URL:           https://pecl.php.net/package/imagick
+Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release:       2%{?dist}
+%forgemeta
+URL:           %{forgeurl}
+Source0:       %{forgesource}
 
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
-BuildRequires: %{?scl_prefix}php-pear
 %if %{with im6}
 BuildRequires: ImageMagick6-devel
 %else
@@ -149,25 +151,15 @@ These are the files needed to compile programs using %{pecl_name} extension.
 %prep
 %setup -q -c
 
-# don't install any font (and test using it)
-# don't install empty file (d41d8cd98f00b204e9800998ecf8427e)
-sed -e '/anonymous_pro_minus.ttf/d' \
-    -e '/015-imagickdrawsetresolution.phpt/d' \
-    -e '/OFL.txt/d' \
-    -e '/LICENSE/s/role="doc"/role="src"/' \
-    -i package.xml
-
-if grep '\.ttf' package.xml
-then : "Font files detected!"
-     exit 1
-fi
-
 cd %{sources}
+: bundled font
+rm tests/*.ttf
+rm tests/015-imagickdrawsetresolution.phpt
+
 : Avoid arginfo to be regenerated
 rm *.stub.php
 
-: Fix permission for archive generated on Windows
-find . -type f -exec chmod -x {} \;
+sed -e '/PHP_IMAGICK_VERSION/s/@PACKAGE_VERSION@/%{upstream_version}%{?upstream_prever}/' -i php_imagick.h
 
 extver=$(sed -n '/#define PHP_IMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_imagick.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -244,25 +236,11 @@ cd ../ZTS
 # Drop in the bit of configuration
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 
-# Install XML package description
-install -D -p -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
 
-# Test & Documentation
-cd %{sources}
-for i in $(grep 'role="test"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do [ -f $i ]          && install -Dpm 644 $i          %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
-   [ -f tests/$i ]    && install -Dpm 644 tests/$i    %{buildroot}%{pecl_testdir}/%{pecl_name}/tests/$i
-done
-for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
-do [ -f $i ]          &&  install -Dpm 644 $i          %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-   [ -f examples/$i ] &&  install -Dpm 644 examples/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/examples/$i
-done
-
 
 %check
 cd %{sources}
@@ -322,8 +300,10 @@ exit $ret
 
 %files
 %license %{sources}/LICENSE
-%doc %{pecl_docdir}/%{pecl_name}
-%{pecl_xmldir}/%{name}.xml
+%doc %{sources}/composer.json
+%doc %{sources}/CREDITS
+%doc %{sources}/ChangeLog
+%doc %{sources}/examples
 
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
@@ -336,7 +316,9 @@ exit $ret
 %files devel
 %doc REFLECTION
 %doc PHPINFO
-%doc %{pecl_testdir}/%{pecl_name}
+%doc %{sources}/util
+%doc %{sources}/tests
+
 %{php_incldir}/ext/%{pecl_name}
 
 %if %{with_zts}
@@ -345,6 +327,10 @@ exit $ret
 
 
 %changelog
+* Fri Mar 13 2026 Remi Collet <remi@remirepo.net> - 3.8.1-2
+- drop pear/pecl dependency
+- sources from github
+
 * Thu Nov 27 2025 Remi Collet <remi@remirepo.net> - 3.8.1-1
 - update to 3.8.1
 - drop patch merged upstream