rebuild for PHP 8.0.0RC1

4 files changed, 13 insertions, 158 deletions

diff --git a/PHPINFO b/PHPINFO
index ce23073..43bfb3f 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,5 +2,5 @@
 rpminfo
 
 rpminfo support => enabled
-Extension version => 0.5.0
+Extension version => 0.5.1
 RPM library version => 4.15.1
diff --git a/REFLECTION b/REFLECTION
index c81f7e6..0f281d0 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #94 rpminfo version 0.5.0 ] {
+Extension [ <persistent> extension #98 rpminfo version 0.5.1 ] {
 
   - Constants [271] {
     Constant [ string RPMVERSION ] { 4.15.1 }
diff --git a/php-pecl-rpminfo.spec b/php-pecl-rpminfo.spec
index daedc3c..f236f2e 100644
--- a/php-pecl-rpminfo.spec
+++ b/php-pecl-rpminfo.spec
@@ -22,15 +22,12 @@
 
 Summary:        RPM information
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        0.5.0
-Release:        5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Version:        0.5.1
+Release:        6%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-# Upstream patch for test suite
-Patch0:         %{pecl_name}-tests.patch
-
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  pkgconfig(rpm) >= 4.11.3
 BuildRequires:  %{?scl_prefix}php-devel > 7
@@ -51,17 +48,14 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{rele
 
 %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-%if "%{php_version}" > "7.2"
-Obsoletes:     php72u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php72w-pecl-%{pecl_name} <= %{version}
-%endif
 %if "%{php_version}" > "7.3"
 Obsoletes:     php73-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php73w-pecl-%{pecl_name} <= %{version}
 %endif
 %if "%{php_version}" > "7.4"
 Obsoletes:     php74-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php74w-pecl-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "8.0"
+Obsoletes:     php80-pecl-%{pecl_name}  <= %{version}
 %endif
 %endif
 
@@ -92,8 +86,6 @@ sed -e 's/role="test"/role="src"/' \
 mv %{pecl_name}-%{version} NTS
 
 cd NTS
-%patch0 -p1 -b .up
-
 # 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
@@ -231,6 +223,12 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 0.5.1-6
+- rebuild for PHP 8.0.0RC1
+
+* Wed Sep 23 2020 Remi Collet <remi@remirepo.net> - 0.5.1-5
+- update to 0.5.1
+
 * Wed Sep  2 2020 Remi Collet <remi@remirepo.net> - 0.5.0-5
 - rebuild for PHP 8.0.0beta3
 
diff --git a/rpminfo-tests.patch b/rpminfo-tests.patch
deleted file mode 100644
index fedb9bd..0000000
--- a/rpminfo-tests.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 2aa9dc045d03c3cf55eefa769b4a54b20c41bc18 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 10 Apr 2020 15:49:35 +0200
-Subject: split tests for PHP 7/8
-
----
- package.xml                     |  4 +++-
- tests/002-rpmvercmp.phpt        | 13 -------------
- tests/010-rpmvercmp_error7.phpt | 25 +++++++++++++++++++++++++
- tests/011-rpmvercmp_error8.phpt | 31 +++++++++++++++++++++++++++++++
- 4 files changed, 59 insertions(+), 14 deletions(-)
- create mode 100644 tests/010-rpmvercmp_error7.phpt
- create mode 100644 tests/011-rpmvercmp_error8.phpt
-
-diff --git a/tests/002-rpmvercmp.phpt b/tests/002-rpmvercmp.phpt
-index 7da40b4..d83cf67 100644
---- a/tests/002-rpmvercmp.phpt
-+++ b/tests/002-rpmvercmp.phpt
-@@ -35,21 +35,8 @@ foreach ($cases as $case) {
- 	}
- }
- if ($ok) echo "OK\n";
--// Errors
--var_dump(rpmvercmp());
--var_dump(rpmvercmp("a"));
--var_dump(rpmvercmp("a", "b", "c"));
- ?>
- Done
- --EXPECTF--
- OK
--
--Warning: rpmvercmp() expects exactly 2 parameters, 0 given in %s/002-rpmvercmp.php on line %d
--NULL
--
--Warning: rpmvercmp() expects exactly 2 parameters, 1 given in %s/002-rpmvercmp.php on line %d
--NULL
--
--Warning: rpmvercmp() expects exactly 2 parameters, 3 given in %s/002-rpmvercmp.php on line %d
--NULL
- Done
-diff --git a/tests/010-rpmvercmp_error7.phpt b/tests/010-rpmvercmp_error7.phpt
-new file mode 100644
-index 0000000..98bfeb3
---- /dev/null
-+++ b/tests/010-rpmvercmp_error7.phpt
-@@ -0,0 +1,25 @@
-+--TEST--
-+Check for rpmvercmp function error
-+--SKIPIF--
-+<?php
-+if (!extension_loaded("rpminfo")) print "skip";
-+if (PHP_VERSION_ID >= 80000) print "skip only for PHP 7";
-+?>
-+--FILE--
-+<?php
-+var_dump(rpmvercmp());
-+var_dump(rpmvercmp("a"));
-+var_dump(rpmvercmp("a", "b", "c"));
-+?>
-+Done
-+--EXPECTF--
-+
-+Warning: rpmvercmp() expects exactly 2 parameters, 0 given in %s/002-rpmvercmp.php on line %d
-+NULL
-+
-+Warning: rpmvercmp() expects exactly 2 parameters, 1 given in %s/002-rpmvercmp.php on line %d
-+NULL
-+
-+Warning: rpmvercmp() expects exactly 2 parameters, 3 given in %s/002-rpmvercmp.php on line %d
-+NULL
-+Done
-diff --git a/tests/011-rpmvercmp_error8.phpt b/tests/011-rpmvercmp_error8.phpt
-new file mode 100644
-index 0000000..3db3564
---- /dev/null
-+++ b/tests/011-rpmvercmp_error8.phpt
-@@ -0,0 +1,31 @@
-+--TEST--
-+Check for rpmvercmp function
-+--SKIPIF--
-+<?php
-+if (!extension_loaded("rpminfo")) print "skip";
-+if (PHP_VERSION_ID < 80000) print "skip only for PHP 8";
-+?>
-+--FILE--
-+<?php
-+try {
-+	var_dump(rpmvercmp());
-+} catch (ArgumentCountError $e) {
-+    echo $e->getMessage(), "\n";
-+}
-+try {
-+	var_dump(rpmvercmp("a"));
-+} catch (ArgumentCountError $e) {
-+    echo $e->getMessage(), "\n";
-+}
-+try {
-+	var_dump(rpmvercmp("a", "b", "c"));
-+} catch (ArgumentCountError $e) {
-+    echo $e->getMessage(), "\n";
-+}
-+?>
-+Done
-+--EXPECTF--
-+rpmvercmp() expects exactly 2 parameters, 0 given
-+rpmvercmp() expects exactly 2 parameters, 1 given
-+rpmvercmp() expects exactly 2 parameters, 3 given
-+Done
--- 
-cgit v1.1
-
-From 895bc3dbd5dd48c97561bb0758f86a8c67bd6874 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Fri, 10 Apr 2020 15:53:11 +0200
-Subject: fix test
-
----
- tests/010-rpmvercmp_error7.phpt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/010-rpmvercmp_error7.phpt b/tests/010-rpmvercmp_error7.phpt
-index 98bfeb3..c9b3875 100644
---- a/tests/010-rpmvercmp_error7.phpt
-+++ b/tests/010-rpmvercmp_error7.phpt
-@@ -14,12 +14,12 @@ var_dump(rpmvercmp("a", "b", "c"));
- Done
- --EXPECTF--
- 
--Warning: rpmvercmp() expects exactly 2 parameters, 0 given in %s/002-rpmvercmp.php on line %d
-+Warning: rpmvercmp() expects exactly 2 parameters, 0 given in %s
- NULL
- 
--Warning: rpmvercmp() expects exactly 2 parameters, 1 given in %s/002-rpmvercmp.php on line %d
-+Warning: rpmvercmp() expects exactly 2 parameters, 1 given in %s
- NULL
- 
--Warning: rpmvercmp() expects exactly 2 parameters, 3 given in %s/002-rpmvercmp.php on line %d
-+Warning: rpmvercmp() expects exactly 2 parameters, 3 given in %s
- NULL
- Done
--- 
-cgit v1.1
-