update to 1.5.0HEADmaster

drop build dependency on clue/block-react, react/event-loop
  and react/promise-timer
switch to classmap autoloader

2 files changed, 19 insertions, 44 deletions

diff --git a/composer.json b/composer.json
index ee3972c..669dab1 100644
--- a/composer.json
+++ b/composer.json
@@ -36,12 +36,9 @@
     "require": {
         "php": ">=5.3",
         "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.6",
-        "react/promise": "^2.1 || ^1.2"
+        "react/promise": "^3 || ^2.1 || ^1.2"
     },
     "require-dev": {
-        "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
-        "react/promise-timer": "^1.0",
-        "clue/block-react": "^1.0",
         "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
     }
 }
diff --git a/php-react-promise-stream.spec b/php-react-promise-stream.spec
index bce006c..ba63eca 100644
--- a/php-react-promise-stream.spec
+++ b/php-react-promise-stream.spec
@@ -12,26 +12,17 @@
 
 %global github_owner     reactphp
 %global github_name      promise-stream
-%global github_version   1.4.0
-%global github_commit    ef05517b99e4363beaa7993d4e2d6c50f1b22a09
+%global github_version   1.5.0
+%global github_commit    e6d2805e09ad50c4896f65f5e8705fe4ee7731a3
 
 %global composer_vendor  react
 %global composer_project promise-stream
 
 # "php": ">=5.3"
 %global php_min_ver 5.3
-# "clue/block-react": "^1.0"
-%global clue_block_react_min_ver 1.0
-%global clue_block_react_max_ver 2.0
-# "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3"
-%global react_event_loop_min_ver 0.3
-%global react_event_loop_max_ver 2.0
-# "react/promise": "^2.1 || ^1.2"
+# "react/promise": "^3 || ^2.1 || ^1.2"
 %global react_promise_min_ver 1.2
-%global react_promise_max_ver 3.0
-# "react/promise-timer": "^1.0"
-%global react_promise_timer_min_ver 1.0
-%global react_promise_timer_max_ver 2.0
+%global react_promise_max_ver 4
 # "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4.6"
 %global react_stream_min_ver 0.4.6
 %global react_stream_max_ver 2.0
@@ -61,18 +52,9 @@ BuildArch:     noarch
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: phpunit9 >= 9.3
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(clue/block-react) >= %{clue_block_react_min_ver} with php-composer(clue/block-react) < %{clue_block_react_max_ver})
-BuildRequires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver})
-BuildRequires: (php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} with php-composer(react/promise-timer) < %{react_promise_timer_max_ver})
 BuildRequires: (php-composer(react/promise) >= %{react_promise_min_ver} with php-composer(react/promise) < %{react_promise_max_ver})
 BuildRequires: (php-composer(react/stream) >= %{react_stream_min_ver} with php-composer(react/stream) < %{react_stream_max_ver})
 %else
-BuildRequires: php-composer(clue/block-react) <  %{clue_block_react_max_ver}
-BuildRequires: php-composer(clue/block-react) >= %{clue_block_react_min_ver}
-BuildRequires: php-composer(react/event-loop) <  %{react_event_loop_max_ver}
-BuildRequires: php-composer(react/event-loop) >= %{react_event_loop_min_ver}
-BuildRequires: php-composer(react/promise-timer) <  %{react_promise_timer_max_ver}
-BuildRequires: php-composer(react/promise-timer) >= %{react_promise_timer_min_ver}
 BuildRequires: php-composer(react/promise) <  %{react_promise_max_ver}
 BuildRequires: php-composer(react/promise) >= %{react_promise_min_ver}
 BuildRequires: php-composer(react/stream) <  %{react_stream_max_ver}
@@ -81,9 +63,9 @@ BuildRequires: php-composer(react/stream) >= %{react_stream_min_ver}
 ##  phpcompatinfo (computed from version 1.2.0)
 BuildRequires: php-reflection
 BuildRequires: php-spl
-## Autoloader
-BuildRequires: php-composer(fedora/autoloader)
 %endif
+## Autoloader
+BuildRequires: php-fedora-autoloader-devel
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
@@ -118,21 +100,17 @@ Autoloader: %{phpdir}/React/Promise/Stream/autoload.php
 
 %build
 : Create autoloader
-cat <<'AUTOLOAD' | tee src/autoload.php
-<?php
-/**
- * Autoloader for %{name} and its' dependencies
- * (created by %{name}-%{version}-%{release}).
- */
-require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
+phpab --template fedora \
+      --output src/autoload.php \
+      src
 
-\Fedora\Autoloader\Autoload::addPsr4('React\\Promise\\Stream\\', __DIR__);
+cat <<'AUTOLOAD' | tee -a src/autoload.php
 
-\Fedora\Autoloader\Dependencies::required(array(
+\Fedora\Autoloader\Dependencies::required([
     '%{phpdir}/React/Promise/autoload.php',
     '%{phpdir}/React/Stream/autoload.php',
     __DIR__.'/functions_include.php',
-));
+]);
 AUTOLOAD
 
 
@@ -149,12 +127,6 @@ cat <<'BOOTSTRAP' | tee bootstrap.php
 require '%{buildroot}%{phpdir}/React/Promise/Stream/autoload.php';
 
 \Fedora\Autoloader\Autoload::addPsr4('React\\Tests\\Promise\\Stream\\', __DIR__.'/tests');
-
-\Fedora\Autoloader\Dependencies::required(array(
-    '%{phpdir}/Clue/React/Block/autoload.php',
-    '%{phpdir}/React/EventLoop/autoload.php',
-    '%{phpdir}/React/Promise/Timer/autoload.php',
-));
 BOOTSTRAP
 
 : Upstream tests
@@ -181,6 +153,12 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri Sep 23 2022 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 1.5.0
+- drop build dependency on clue/block-react, react/event-loop
+  and react/promise-timer
+- switch to classmap autoloader
+
 * Mon Jun 20 2022 Remi Collet <remi@remirepo.net> - 1.4.0-1
 - update to 1.4.0