add upstream patch to relax test for RPM 5HEADmaster

3 files changed, 52 insertions, 23 deletions

diff --git a/PHPINFO b/PHPINFO
index 8008be9..aa6cde5 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,8 +2,8 @@
 rpminfo
 
 rpminfo support => enabled
-Extension version => 1.1.1
+Extension version => 1.2.0
 Author => Remi Collet
 License => PHP-3.01
-RPM library version => 4.19.1.1
+RPM library version => 4.20.1
 RPM stream wrapper => yes
diff --git a/REFLECTION b/REFLECTION
index a216d7d..b86214b 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,7 +1,7 @@
-Extension [ <persistent> extension #91 rpminfo version 1.1.1 ] {
+Extension [ <persistent> extension #105 rpminfo version 1.2.0 ] {
 
   - Constants [285] {
-    Constant [ string RPMVERSION ] { 4.19.1.1 }
+    Constant [ string RPMVERSION ] { 4.20.1 }
     Constant [ int RPMSENSE_ANY ] { 0 }
     Constant [ int RPMSENSE_LESS ] { 2 }
     Constant [ int RPMSENSE_GREATER ] { 4 }
@@ -340,6 +340,27 @@ Extension [ <persistent> extension #91 rpminfo version 1.1.1 ] {
       }
       - Return [ ?string ]
     }
+    Function [ <internal:rpminfo> function rpmexpand ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <required> string $text ]
+      }
+      - Return [ string ]
+    }
+    Function [ <internal:rpminfo> function rpmexpandnumeric ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <required> string $text ]
+      }
+      - Return [ int ]
+    }
+    Function [ <internal:rpminfo> function rpmdefine ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <required> string $macro ]
+      }
+      - Return [ bool ]
+    }
   }
 }
 
diff --git a/php-pecl-rpminfo.spec b/php-pecl-rpminfo.spec
index c4353f5..1808b08 100644
--- a/php-pecl-rpminfo.spec
+++ b/php-pecl-rpminfo.spec
@@ -1,8 +1,8 @@
 # remirepo spec file for php-pecl-rpminfo
 #
-# Copyright (c) 2018-2024 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText:  Copyright 2018-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #
@@ -12,6 +12,8 @@
 %{?scl:%scl_package php-pecl-rpminfo}
 
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
+%global pie_vend    remi
+%global pie_proj    rpminfo
 %global pecl_name   rpminfo
 %global ini_name    40-%{pecl_name}.ini
 %global sources     %{pecl_name}-%{version}
@@ -19,12 +21,14 @@
 
 Summary:        RPM information
 Name:           %{?scl_prefix}php-pecl-%{pecl_name}
-Version:        1.1.1
-Release:        2%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:        1.2.0
+Release:        3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP-3.01
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{sources}.tgz
 
+Patch0:         0001-relax-test-for-RPM-5.patch
+
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  pkgconfig(rpm) >= 4.13
@@ -34,10 +38,11 @@ BuildRequires:  %{?scl_prefix}php-pear
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
 
-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}
+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}
+Provides:       %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
 
 
 %description
@@ -58,6 +63,8 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd %{sources}
+%patch -P0 -p1
+
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_RPMINFO_VERSION/{s/.* "//;s/".*$//;p}' php_rpminfo.h)
 if test "x${extver}" != "x%{version}"; then
@@ -144,30 +151,24 @@ rm tests/013-rpmdbsearch-error.phpt
 # Minimal load test for NTS extension
 %{__php} --no-php-ini \
     --define extension=%{buildroot}/%{php_extdir}/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
+    --modules | grep '^%{pecl_name}$'
 
 %if %{with tests}
 # Upstream test suite  for NTS extension
-TEST_PHP_EXECUTABLE=%{__php} \
 TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_extdir}/%{pecl_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__php} -n run-tests.php --show-diff %{?_smp_mflags}
+%{__php} -n run-tests.php -q --show-diff %{?_smp_mflags}
 %endif
 
 %if %{with_zts}
 # Minimal load test for ZTS extension
 %{__ztsphp} --no-php-ini \
     --define extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
+    --modules | grep '^%{pecl_name}$'
 
 %if %{with tests}
 # Upstream test suite  for ZTS extension
-TEST_PHP_EXECUTABLE=%{__ztsphp} \
 TEST_PHP_ARGS="-n -d extension=%{buildroot}/%{php_ztsextdir}/%{pecl_name}.so" \
-NO_INTERACTION=1 \
-REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php --show-diff %{?_smp_mflags}
+%{__ztsphp} -n run-tests.php -q --show-diff %{?_smp_mflags}
 %endif
 %endif
 
@@ -187,6 +188,13 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Thu May 22 2025 Remi Collet <remi@remirepo.net> - 1.2.0-3
+- add upstream patch to relax test for RPM 5
+
+* Thu Dec 19 2024 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- update to 1.2.0
+- re-license spec file to CECILL-2.1
+
 * Tue Sep 24 2024 Remi Collet <remi@remirepo.net> - 1.1.1-2
 - rebuild for 8.4.0RC1