summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2026-04-06 17:07:07 +0200
committerRemi Collet <remi@php.net>2026-04-06 17:07:07 +0200
commita4eb93430d80b21279f3158a2ec9bd86f3ef6141 (patch)
tree5dc2614549bb16fbc75d915ad88c64a944ca8d1f
parent321a95a254dd41e949d376bf2b86207d05ecf80f (diff)
add pie virtual providesHEADmaster
drop pear/pecl dependency sources from github
-rw-r--r--composer.json12
-rw-r--r--php-pecl-xmldiff.spec72
2 files changed, 49 insertions, 35 deletions
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..d8294eb
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,12 @@
+{
+ "name": "pecl/xml-xmldiff",
+ "type": "php-ext",
+ "license": "BSD-2-Clause",
+ "description": "The extension is able to produce diffs of two XML documents and then to apply the difference to the source document. The diff is a XML document containing copy/insert/delete instruction nodes in human readable format. DOMDocument objects, local files and strings in memory can be processed.",
+ "require": {
+ "php": ">= 7.0.0"
+ },
+ "php-ext": {
+ "extension-name": "xmldiff"
+ }
+}
diff --git a/php-pecl-xmldiff.spec b/php-pecl-xmldiff.spec
index 8093495..e468caa 100644
--- a/php-pecl-xmldiff.spec
+++ b/php-pecl-xmldiff.spec
@@ -1,6 +1,6 @@
# remirepo spec file for php-pecl-xmldiff
#
-# SPDX-FileCopyrightText: Copyright 2013-2025 Remi Collet
+# SPDX-FileCopyrightText: Copyright 2013-2026 Remi Collet
# SPDX-License-Identifier: CECILL-2.1
# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
@@ -8,25 +8,33 @@
#
%{?scl:%scl_package php-pecl-xmldiff}
-%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
-%global pecl_name xmldiff
+%global pie_vend pecl
+%global pie_proj xml-xmldiff
+%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
+%global pecl_name xmldiff
# After 20-dom
-%global ini_name 40-%{pecl_name}.ini
-%global sources %{pecl_name}-%{version}
+%global ini_name 40-%{pecl_name}.ini
+%global sources %{gh_proj}-%{version}
%global _configure ../%{sources}/configure
-Summary: XML diff and merge
+# Github forge
+%global gh_vend php
+%global gh_proj pecl-xml-xmldiff
+%global forgeurl https://github.com/%{gh_vend}/%{gh_proj}
+%global tag %{version}
+
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 1.1.6
-Release: 1%{?dist}
+Summary: XML diff and merge
License: BSD-2-Clause
-URL: https://pecl.php.net/package/%{pecl_name}
-Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+Version: 1.1.6
+Release: 2%{?dist}
+%forgemeta
+URL: %{forgeurl}
+Source0: %{forgesource}
BuildRequires: %{?dtsprefix}gcc
BuildRequires: make
BuildRequires: %{?scl_prefix}php-devel
-BuildRequires: %{?scl_prefix}php-pear
BuildRequires: %{?scl_prefix}php-dom
BuildRequires: %{?scl_prefix}php-libxml
BuildRequires: diffmark-devel
@@ -37,10 +45,15 @@ Requires: %{?scl_prefix}php(api) = %{php_core_api}
Requires: %{?scl_prefix}php-dom%{?_isa}
Requires: %{?scl_prefix}php-libxml%{?_isa}
-Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
-Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{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}
%description
@@ -66,12 +79,7 @@ These are the files needed to compile programs using %{name}.
%prep
%setup -q -c
-sed -e '/name="diffmark/d' \
- -e '/LICENSE/s/role="doc"/role="src"/' \
- -i package.xml
-
cd %{sources}
-
# drop bundled library to ensure it is not used
rm -rf diffmark
@@ -131,23 +139,12 @@ cd ../ZTS
# 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
-# Test & 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
-for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i
-done
-
%check
cd %{sources}
@@ -180,8 +177,9 @@ REPORT_EXIT_STATUS=1 \
%files
%license %{sources}/LICENSE
-%doc %{pecl_docdir}/%{pecl_name}
-%{pecl_xmldir}/%{name}.xml
+%doc %{sources}/composer.json
+%doc %{sources}/CREDITS
+
%config(noreplace) %{php_inidir}/%{ini_name}
%{php_extdir}/%{pecl_name}.so
@@ -191,8 +189,7 @@ REPORT_EXIT_STATUS=1 \
%endif
%files devel
-%defattr(-,root,root,-)
-%doc %{pecl_testdir}/%{pecl_name}
+%doc %{sources}/tests
%{php_incldir}/ext/%{pecl_name}
%if %{with_zts}
@@ -201,6 +198,11 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Mon Apr 6 2026 Remi Collet <remi@remirepo.net> - 1.1.6-2
+- add pie virtual provides
+- drop pear/pecl dependency
+- sources from github
+
* Sat Dec 20 2025 Remi Collet <remi@remirepo.net> - 1.1.6-1
- update to 1.1.6
- drop patch merged upstream