update to 6.0.0

raise dependency on PHP 8.2
raise dependency on sebastian/diff 6
raise dependency on sebastian/exporter 6
rename to php-sebastian-comparator6
move to /usr/share/php/SebastianBergmann/Comparator6

2 files changed, 38 insertions, 32 deletions

diff --git a/composer.json b/composer.json
index a53ecba..215e1ca 100644
--- a/composer.json
+++ b/composer.json
@@ -28,18 +28,18 @@
     },
     "prefer-stable": true,
     "require": {
-        "php": ">=8.1",
-        "sebastian/diff": "^5.0",
-        "sebastian/exporter": "^5.0",
+        "php": ">=8.2",
+        "sebastian/diff": "^6.0",
+        "sebastian/exporter": "^6.0",
         "ext-dom": "*",
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.3"
+        "phpunit/phpunit": "^11.0"
     },
     "config": {
         "platform": {
-            "php": "8.1.0"
+            "php": "8.2.0"
         },
         "optimize-autoloader": true,
         "sort-packages": true
@@ -56,7 +56,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "5.0-dev"
+            "dev-main": "6.0-dev"
         }
     }
 }
diff --git a/php-sebastian-comparator6.spec b/php-sebastian-comparator6.spec
index cd578ee..5774ae9 100644
--- a/php-sebastian-comparator6.spec
+++ b/php-sebastian-comparator6.spec
@@ -1,4 +1,4 @@
-# remirepo/fedora spec file for php-sebastian-comparator5
+# remirepo/fedora spec file for php-sebastian-comparator6
 #
 # Copyright (c) 2014-2024 Remi Collet
 # License: CC-BY-SA-4.0
@@ -7,25 +7,26 @@
 # Please, preserve the changelog entries
 #
 
-# disabled until phpunit10 available
-%bcond_without       tests
+# disabled until phpunit11 available
+%bcond_with          tests
 
-%global gh_commit    2db5010a484d53ebf536087a70b4a5423c102372
+%global gh_commit    bd0f2fa5b9257c69903537b266ccb80fcf940db8
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   comparator
+%global gh_date      2024-02-02
 # Packagist
 %global pk_vendor    sebastian
 %global pk_project   %{gh_project}
 # Namespace
-%global major        5
+%global major        6
 %global php_home     %{_datadir}/php
 %global ns_vendor    SebastianBergmann
 %global ns_project   Comparator
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        5.0.1
-Release:        4%{?dist}
+Version:        6.0.0
+Release:        1%{?dist}
 Summary:        Compare PHP values for equality, version %{major}
 
 License:        BSD-3-Clause
@@ -33,32 +34,30 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
-Patch0:         %{name}-upstream.patch
-
 BuildArch:      noarch
-BuildRequires:  php(language) >= 8.1
+BuildRequires:  php(language) >= 8.2
 BuildRequires:  php-date
 BuildRequires:  php-dom
 BuildRequires:  php-mbstring
 BuildRequires:  php-spl
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(%{pk_vendor}/diff)     >= 5.0   with php-composer(%{pk_vendor}/diff)     < 6)
-BuildRequires:  (php-composer(%{pk_vendor}/exporter) >= 5.0   with php-composer(%{pk_vendor}/exporter) < 6)
+BuildRequires:  (php-composer(%{pk_vendor}/diff)     >= 6.0   with php-composer(%{pk_vendor}/diff)     < 7)
+BuildRequires:  (php-composer(%{pk_vendor}/exporter) >= 6.0   with php-composer(%{pk_vendor}/exporter) < 7)
 # remirepo:4
 %else
-BuildRequires:  php-sebastian-diff5
-BuildRequires:  php-sebastian-exporter5
+BuildRequires:  php-sebastian-diff6
+BuildRequires:  php-sebastian-exporter6
 %endif
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with tests}
 # from composer.json, "require-dev": {
-#        "phpunit/phpunit": "^10.4"
-BuildRequires:  phpunit10 >= 10.4
+#        "phpunit/phpunit": "^11.0"
+BuildRequires:  phpunit11
 %endif
 
 # from composer.json
-#        "php": ">=8.1",
+#        "php": ">=8.2",
 #        "sebastian/diff": "^5.0",
 #        "sebastian/exporter": "^5.0"
 #        "ext-dom": "*",
@@ -68,12 +67,12 @@ Requires:       php-dom
 Requires:       php-mbstring
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(%{pk_vendor}/diff)     >= 5.0   with php-composer(%{pk_vendor}/diff)     < 6)
-Requires:       (php-composer(%{pk_vendor}/exporter) >= 5.0   with php-composer(%{pk_vendor}/exporter) < 6)
+Requires:       (php-composer(%{pk_vendor}/diff)     >= 6.0   with php-composer(%{pk_vendor}/diff)     < 7)
+Requires:       (php-composer(%{pk_vendor}/exporter) >= 6.0   with php-composer(%{pk_vendor}/exporter) < 7)
 # remirepo:4
 %else
-Requires:       php-sebastian-diff5
-Requires:       php-sebastian-exporter5
+Requires:       php-sebastian-diff6
+Requires:       php-sebastian-exporter6
 %endif
 # from phpcompatinfo report for version 5.0.0
 Requires:       php-date
@@ -94,7 +93,6 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch -P0 -p1
 
 
 %build
@@ -105,8 +103,8 @@ phpab --template fedora --output src/autoload.php src
 cat <<EOF | tee -a src/autoload.php
 
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}/%{ns_vendor}/Diff5/autoload.php',
-    '%{php_home}/%{ns_vendor}/Exporter5/autoload.php',
+    '%{php_home}/%{ns_vendor}/Diff6/autoload.php',
+    '%{php_home}/%{ns_vendor}/Exporter6/autoload.php',
 ]);
 EOF
 
@@ -123,10 +121,10 @@ mkdir vendor
 
 : Run upstream test suite
 ret=0
-for cmd in php php81 php82 php83; do
+for cmd in php php82 php83; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
-      %{_bindir}/phpunit10 --no-coverage || ret=1
+      %{_bindir}/phpunit11 --no-coverage || ret=1
   fi
 done
 exit $ret
@@ -144,6 +142,14 @@ exit $ret
 
 
 %changelog
+* Mon Feb  5 2024 Remi Collet <remi@remirepo.net> - 6.0.0-1
+- update to 6.0.0
+- raise dependency on PHP 8.2
+- raise dependency on sebastian/diff 6
+- raise dependency on sebastian/exporter 6
+- rename to php-sebastian-comparator6
+- move to /usr/share/php/SebastianBergmann/Comparator6
+
 * Tue Jan 30 2024 Remi Collet <remi@remirepo.net> - 5.0.1-4
 - add upstream patch for phpunit >= 10.4 FTBFS #2261508