update to 2.0.0HEADmaster

rename to php-doctrine-event-manager2
install in /usr/share/php/Doctrine/EventManager2

2 files changed, 27 insertions, 47 deletions

diff --git a/composer.json b/composer.json
index deeb7e0..756e93d 100644
--- a/composer.json
+++ b/composer.json
@@ -38,14 +38,13 @@
     ],
     "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
     "require": {
-        "php": "^7.1 || ^8.0",
-        "doctrine/deprecations": "^0.5.3 || ^1"
+        "php": "^8.1"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^9 || ^10",
-        "phpstan/phpstan": "~1.4.10 || ^1.8.8",
-        "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-        "vimeo/psalm": "^4.24"
+        "doctrine/coding-standard": "^10",
+        "phpstan/phpstan": "^1.8.8",
+        "phpunit/phpunit": "^9.5",
+        "vimeo/psalm": "^4.28"
     },
     "conflict": {
         "doctrine/common": "<2.9"
diff --git a/php-doctrine-event-manager2.spec b/php-doctrine-event-manager2.spec
index ce7d705..1288e07 100644
--- a/php-doctrine-event-manager2.spec
+++ b/php-doctrine-event-manager2.spec
@@ -1,4 +1,4 @@
-# remirepo/fedora spec file for php-doctrine-event-manager
+# remirepo/fedora spec file for php-doctrine-event-manager2
 #
 # Copyright (c) 2018-2022 Remi Collet
 # License: CC-BY-SA
@@ -8,7 +8,7 @@
 #
 
 %global bootstrap    0
-%global gh_commit    95aa4cb529f1e96576f3fda9f5705ada4056a520
+%global gh_commit    750671534e0241a7c50ea5b43f67e23eb5c96f32
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     doctrine
 %global gh_project   event-manager
@@ -19,16 +19,17 @@
 %global ns_vendor    Doctrine
 %global ns_project   Common
 %global ns_subproj   EventManager
+%global major        2
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
 %else
 %global with_tests   0%{!?_without_tests:1}
 %endif
 
-Name:           php-%{pk_vendor}-%{pk_project}
-Version:        1.2.0
+Name:           php-%{pk_vendor}-%{pk_project}%{major}
+Version:        2.0.0
 Release:        1%{?dist}
-Summary:        Simple PHP event system, version 1
+Summary:        Simple PHP event system, version %{major}
 
 License:        MIT
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -38,33 +39,16 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with_tests}
-BuildRequires:  php(language) >= 7.1
+BuildRequires:  php(language) >= 8.1
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(doctrine/deprecations)  >= 0.5.3 with php-composer(doctrine/deprecations)  < 2)
-# remirepo:4
-%else
-BuildRequires:  php-composer(doctrine/deprecations)  <  2
-BuildRequires:  php-composer(doctrine/deprecations)  >= 0.5.3
-%endif
-BuildRequires:  phpunit9
+BuildRequires:  phpunit9 >= 9.5
 %endif
 
 # From composer.json
-#        "php": "^7.1 || ^8.0"
-#        "doctrine/deprecations": "^0.5.3 || ^1"
-Requires:       php(language) >= 7.1
-# remirepo:1
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:      (php-composer(doctrine/deprecations)  >= 0.5.3 with php-composer(doctrine/deprecations)  < 2)
-# remirepo:4
-%else
-Requires:       php-composer(doctrine/deprecations)  <  2
-Requires:       php-composer(doctrine/deprecations)  >= 0.5.3
-%endif
-# From phpcompatinfo report for version 1.2.0
+#        "php": "^8.1"
+Requires:       php(language) >= 8.1
+# From phpcompatinfo report for version 2.0.0
 Requires:       php-spl
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
@@ -78,7 +62,7 @@ Conflicts:      php-doctrine-common < 1:2.9
 The Doctrine Event Manager is a simple PHP event system that was built
 to be used with the various Doctrine projects.
 
-Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php
+Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php
 
 
 %prep
@@ -87,23 +71,15 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.ph
 
 %build
 : Generate a simple autoloader
-mkdir src/%{ns_subproj}
 %{_bindir}/phpab \
-    --output src/%{ns_subproj}/autoload.php \
+    --output src/autoload.php \
     --template fedora \
     src
 
-cat << 'AUTOLOAD' | tee -a src/%{ns_subproj}/autoload.php
-
-\Fedora\Autoloader\Dependencies::required([
-    '%{_datadir}/php/Doctrine/Deprecations/autoload.php',
-]);
-AUTOLOAD
-
 
 %install
 mkdir -p   %{buildroot}%{_datadir}/php/%{ns_vendor}
-cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}
+cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_subproj}%{major}
 
 
 %check
@@ -115,12 +91,12 @@ mkdir vendor
     --template fedora \
     tests
 cat << 'EOF' | tee -a vendor/autoload.php
-require "%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/%{ns_subproj}/autoload.php";
+require "%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_subproj}%{major}/autoload.php";
 EOF
 
 : Run test suite
 ret=0
-for cmd in php php74 php80 php81 php82; do
+for cmd in php php81 php82; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit9 \
         --bootstrap vendor/autoload.php \
@@ -140,10 +116,15 @@ exit $ret
 %doc *.md
 %doc composer.json
 %dir %{_datadir}/php/%{ns_vendor}/
-     %{_datadir}/php/%{ns_vendor}/%{ns_project}/
+     %{_datadir}/php/%{ns_vendor}/%{ns_subproj}%{major}/
 
 
 %changelog
+* Thu Oct 13 2022 Remi Collet <remi@remirepo.net> - 2.0.0-1
+- update to 2.0.0
+- rename to php-doctrine-event-manager2
+- install in /usr/share/php/Doctrine/EventManager2
+
 * Thu Oct 13 2022 Remi Collet <remi@remirepo.net> - 1.2.0-1
 - update to 1.2.0
 - add dependency on doctrine/deprecations