v0.7.7 from Fedora

* Sun Jul 01 2018 Shawn Iwinski <shawn@iwin.ski> - 0.7.7-1
- Update to 0.7.7 (RHBZ #1431349)
- Add range version dependencies for Fedora >= 27 || RHEL >= 8
- Add composer.json to repo

3 files changed, 57 insertions, 53 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fc9aa8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
index 84de2a1..f6faa66 100644
--- a/composer.json
+++ b/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "react/stream",
-    "description": "Basic readable and writable stream interfaces that support piping.",
-    "keywords": ["stream", "pipe"],
+    "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
+    "keywords": ["event-driven", "readable", "writable", "stream", "non-blocking", "io", "pipe", "ReactPHP"],
     "license": "MIT",
     "require": {
         "php": ">=5.3.8",
-        "evenement/evenement": "^2.0|^1.0"
+        "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
+        "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
     },
     "require-dev": {
-        "react/event-loop": "^0.4|^0.3",
-        "react/promise": "^2.0|^1.0",
+        "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35",
         "clue/stream-filter": "~1.2"
     },
-    "suggest": {
-        "react/event-loop": "^0.4",
-        "react/promise": "^2.0"
-    },
     "autoload": {
         "psr-4": {
             "React\\Stream\\": "src"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "React\\Tests\\Stream\\": "tests"
+        }
     }
 }
diff --git a/php-react-stream.spec b/php-react-stream.spec
index b8a2319..9b52bfe 100644
--- a/php-react-stream.spec
+++ b/php-react-stream.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-react-stream
 #
-# Copyright (c) 2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2017-2018 Shawn Iwinski <shawn@iwin.ski>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -12,8 +12,8 @@
 
 %global github_owner     reactphp
 %global github_name      stream
-%global github_version   0.4.6
-%global github_commit    44dc7f51ea48624110136b535b9ba44fd7d0c1ee
+%global github_version   0.7.7
+%global github_commit    10100896018fd847a257cd81143b8e1b7be08e40
 
 %global composer_vendor  react
 %global composer_project stream
@@ -23,18 +23,13 @@
 # "clue/stream-filter": "~1.2"
 %global clue_stream_filter_min_ver 1.2
 %global clue_stream_filter_max_ver 2.0
-# "evenement/evenement": "^2.0|^1.0"
-#     NOTE: Min version not 1.0 to restrict to one major version
+# "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
+#     NOTE: Restricted to one major version
 %global evenement_min_ver 2.0
 %global evenement_max_ver 3.0
-# "react/event-loop": "^0.4" (suggest)
-# "react/event-loop": "^0.4|^0.3" (require-dev)
-%global react_event_loop_min_ver 0.4
-%global react_event_loop_max_ver 1.0
-# "react/promise": "^2.0" (suggest)
-# "react/promise": "^2.0|^1.0" (require-dev)
-%global react_promise_min_ver 2.0
-%global react_promise_max_ver 3.0
+# "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5"
+%global react_event_loop_min_ver 0.3.5
+%global react_event_loop_max_ver 2.0
 
 # Build using "--without tests" to disable tests
 %global with_tests 0%{!?_without_tests:1}
@@ -48,8 +43,8 @@ Summary:       Basic readable and writable stream interfaces that support piping
 
 Group:         Development/Libraries
 License:       MIT
-URL:           https://github.com/%{github_owner}/%{github_name}
-Source0:       %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
+URL:           https://reactphp.org/stream/
+Source0:       https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
 
 BuildArch:     noarch
 # Tests
@@ -57,15 +52,19 @@ BuildArch:     noarch
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
 BuildRequires: php-composer(phpunit/phpunit)
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(clue/stream-filter) >= %{clue_stream_filter_min_ver} with php-composer(clue/stream-filter) < %{clue_stream_filter_max_ver})
+BuildRequires: (php-composer(evenement/evenement) >= %{evenement_min_ver} with php-composer(evenement/evenement) < %{evenement_max_ver})
+BuildRequires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver})
+%else
 BuildRequires: php-composer(clue/stream-filter) <  %{clue_stream_filter_max_ver}
 BuildRequires: php-composer(clue/stream-filter) >= %{clue_stream_filter_min_ver}
 BuildRequires: php-composer(evenement/evenement) <  %{evenement_max_ver}
 BuildRequires: php-composer(evenement/evenement) >= %{evenement_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) <  %{react_promise_max_ver}
-BuildRequires: php-composer(react/promise) >= %{react_promise_min_ver}
-## phpcompatinfo (computed from version 0.4.6)
+%endif
+# phpcompatinfo (computed from version 0.7.7)
 BuildRequires: php-spl
 ## Autoloader
 BuildRequires: php-composer(fedora/autoloader)
@@ -73,19 +72,20 @@ BuildRequires: php-composer(fedora/autoloader)
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-composer(evenement/evenement) >= %{evenement_min_ver} with php-composer(evenement/evenement) < %{evenement_max_ver})
+Requires:      (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver})
+%else
 Requires:      php-composer(evenement/evenement) <  %{evenement_max_ver}
 Requires:      php-composer(evenement/evenement) >= %{evenement_min_ver}
-# phpcompatinfo (computed from version 0.4.6)
+Requires:      php-composer(react/event-loop) <  %{react_event_loop_max_ver}
+Requires:      php-composer(react/event-loop) >= %{react_event_loop_min_ver}
+%endif
+# phpcompatinfo (computed from version 0.7.7)
 Requires:      php-spl
 # Autoloader
 Requires:      php-composer(fedora/autoloader)
 
-# Weak dependencies
-%if 0%{?fedora} >= 21
-Suggests:      php-composer(react/event-loop)
-Suggests:      php-composer(react/promise)
-%endif
-
 # Composer
 Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
@@ -123,11 +123,7 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Dependencies::required(array(
     '%{phpdir}/Evenement/autoload.php',
-));
-
-\Fedora\Autoloader\Dependencies::optional(array(
     '%{phpdir}/React/EventLoop/autoload.php',
-    '%{phpdir}/React/Promise/autoload.php',
 ));
 AUTOLOAD
 
@@ -151,24 +147,19 @@ require '%{buildroot}%{phpdir}/React/Stream/autoload.php';
 ));
 BOOTSTRAP
 
-: Skip tests requiring stream_socket_server tcp://localhost:0
-sed \
-    -e 's/function testDoesNotWriteDataIfClientSideHasBeenClosed/function SKIP_testDoesNotWriteDataIfClientSideHasBeenClosed/' \
-    -e 's/function testDoesNotWriteDataIfServerSideHasBeenClosed/function SKIP_testDoesNotWriteDataIfServerSideHasBeenClosed/' \
-    -i tests/StreamIntegrationTest.php
-
+: Skip tests requiring network access
+rm -f tests/FunctionalInternetTest.php
 
 : Upstream tests
-%{_bindir}/phpunit --verbose --bootstrap bootstrap.php
-
-: Upstream tests with SCLs if available
-SCL_RETURN_CODE=0
-for SCL in %{?rhel:php54 php55} php56 php70 php71; do
-    if which $SCL; then
-        $SCL %{_bindir}/phpunit --verbose --bootstrap bootstrap.php || SCL_RETURN_CODE=1
+RETURN_CODE=0
+PHPUNIT=$(which phpunit)
+for PHP_EXEC in "" %{?rhel:php54 php55} php70 php71 php72 php73; do
+    if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
+        $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
+            || RETURN_CODE=1
     fi
 done
-exit $SCL_RETURN_CODE
+exit $RETURN_CODE
 %else
 : Tests skipped
 %endif
@@ -183,7 +174,11 @@ exit $SCL_RETURN_CODE
 
 
 %changelog
-%changelog
+* Sun Jul 01 2018 Shawn Iwinski <shawn@iwin.ski> - 0.7.7-1
+- Update to 0.7.7 (RHBZ #1431349)
+- Add range version dependencies for Fedora >= 27 || RHEL >= 8
+- Add composer.json to repo
+
 * Thu Jan 26 2017 Shawn Iwinski <shawn@iwin.ski> - 0.4.6-1
 - Update to 0.4.6 (RHBZ #1416595)