summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore11
-rw-r--r--composer.json17
-rw-r--r--php-react-child-process.spec74
3 files changed, 62 insertions, 40 deletions
diff --git a/.gitignore b/.gitignore
index f677200..fc9aa8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
-/php-react-child-process-0.4.1-3ab4f83c6f6c5862f7ca28d999a92d327472a671.tar.gz
-/php-react-child-process-0.4.2-be6ebd7763170626794cbcb5c7b7ffdf5c9a4cb4.tar.gz
-/php-react-child-process-0.4.3-b81d06daaafb5d7d592b6f7f8b1b7905cdef9ac6.tar.gz
+clog
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
index cf8e489..59b088d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,19 +1,22 @@
{
"name": "react/child-process",
- "description": "Library for executing child processes.",
- "keywords": ["process"],
+ "description": "Event-driven library for executing child processes with ReactPHP.",
+ "keywords": ["process", "event-driven", "ReactPHP"],
"license": "MIT",
"require": {
"php": ">=5.3.0",
- "evenement/evenement": "^2.0 || ^1.0",
- "react/event-loop": "^0.4 || ^0.3",
- "react/stream": "^0.5 || ^0.4.4"
+ "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+ "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
+ "react/stream": "^1.0 || ^0.7.6"
},
"require-dev": {
- "phpunit/phpunit": "^5.0 || ^4.8.10",
- "sebastian/environment": "~1.0"
+ "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35",
+ "sebastian/environment": "^3.0 || ^2.0 || ^1.0"
},
"autoload": {
"psr-4": { "React\\ChildProcess\\": "src" }
+ },
+ "autoload-dev": {
+ "psr-4": { "React\\Tests\\ChildProcess\\": "tests" }
}
}
diff --git a/php-react-child-process.spec b/php-react-child-process.spec
index 66bec35..f562004 100644
--- a/php-react-child-process.spec
+++ b/php-react-child-process.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-react-child-process
#
-# 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,36 +12,27 @@
%global github_owner reactphp
%global github_name child-process
-%global github_version 0.4.3
-%global github_commit b81d06daaafb5d7d592b6f7f8b1b7905cdef9ac6
+%global github_version 0.5.2
+%global github_commit aae49d7f1340bafb695b9af3ce4421ea41a39620
%global composer_vendor react
%global composer_project child-process
# "php": ">=5.3.0"
%global php_min_ver 5.3.0
-# "evenement/evenement": "^2.0 || ^1.0"
-# NOTE: Min version not 1.0 to limit to 1 major version
+# "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
+# NOTE: Forced single major version
%global evenement_min_ver 2.0
%global evenement_max_ver 3.0
-# "react/event-loop": "^0.4 || ^0.3"
-%global react_event_loop_min_ver 0.3
-%global react_event_loop_max_ver 1.0
-# "react/stream": "^0.5 || ^0.4.4"
-%global react_stream_min_ver 0.4.4
-%global react_stream_max_ver 1.0
-# "sebastian/environment": "~1.0"
-%if 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
+# "react/stream": "^1.0 || ^0.7.6"
+%global react_stream_min_ver 0.7.6
+%global react_stream_max_ver 2.0
+# "sebastian/environment": "^3.0 || ^2.0 || ^1.0"
%global sebastian_environment_min_ver 1.0
-%global sebastian_environment_max_ver 2.0
-%else
-# NOTE: Max version not 2.0 because:
-# - only v2 is provided in F24+
-# - upstream tests pass
-# - only a build (i.e. not runtime) dependency
-%global sebastian_environment_min_ver 2.0
-%global sebastian_environment_max_ver 3.0
-%endif
+%global sebastian_environment_max_ver 4.0
# Build using "--without tests" to disable tests
%global with_tests 0%{!?_without_tests:1}
@@ -55,8 +46,8 @@ Summary: Library for executing child processes
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/child-process/
+Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
BuildArch: noarch
# Tests
@@ -64,15 +55,23 @@ 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(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})
+BuildRequires: (php-composer(react/stream) >= %{react_stream_min_ver} with php-composer(react/stream) < %{react_stream_max_ver})
+BuildRequires: (php-composer(sebastian/environment) >= %{sebastian_environment_min_ver} with php-composer(sebastian/environment) < %{sebastian_environment_max_ver})
+%else
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/stream) < %{react_stream_max_ver}
BuildRequires: php-composer(react/stream) >= %{react_stream_min_ver}
-BuildRequires: php-composer(sebastian/environment) < %{sebastian_environment_max_ver}
-BuildRequires: php-composer(sebastian/environment) >= %{sebastian_environment_min_ver}
-## phpcompatinfo (computed from version 0.4.3)
+# use the one pulled by PHPUnit
+#BuildRequires: php-composer(sebastian/environment) < %%{sebastian_environment_max_ver}
+#BuildRequires: php-composer(sebastian/environment) >= %%{sebastian_environment_min_ver}
+%endif
+## phpcompatinfo (computed from version 0.5.2)
BuildRequires: php-pcntl
BuildRequires: php-spl
## Autoloader
@@ -81,13 +80,19 @@ 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})
+Requires: (php-composer(react/stream) >= %{react_stream_min_ver} with php-composer(react/stream) < %{react_stream_max_ver})
+%else
Requires: php-composer(evenement/evenement) < %{evenement_max_ver}
Requires: php-composer(evenement/evenement) >= %{evenement_min_ver}
Requires: php-composer(react/event-loop) < %{react_event_loop_max_ver}
Requires: php-composer(react/event-loop) >= %{react_event_loop_min_ver}
Requires: php-composer(react/stream) < %{react_stream_max_ver}
Requires: php-composer(react/stream) >= %{react_stream_min_ver}
-# phpcompatinfo (computed from version 0.4.3)
+%endif
+# phpcompatinfo (computed from version 0.5.2)
Requires: php-spl
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -140,7 +145,11 @@ require '%{buildroot}%{phpdir}/React/ChildProcess/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('React\\Tests\\ChildProcess\\', __DIR__.'/tests');
\Fedora\Autoloader\Dependencies::required(array(
- '%{phpdir}/SebastianBergmann/Environment/autoload.php',
+ array(
+ '%{phpdir}/SebastianBergmann/Environment3/autoload.php',
+ '%{phpdir}/SebastianBergmann/Environment2/autoload.php',
+ '%{phpdir}/SebastianBergmann/Environment/autoload.php',
+ ),
));
BOOTSTRAP
@@ -150,7 +159,7 @@ sed 's/function testProcessPidNotSameDueToShellWrapper/function SKIP_testProcess
: Upstream tests
RETURN_CODE=0
-for PHP_EXEC in php %{?rhel:php54 php55} php56 php70 php71; do
+for PHP_EXEC in php %{?rhel:php54 php55 php56} php70 php71 php72 php73; do
if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC %{_bindir}/phpunit --verbose --bootstrap bootstrap.php \
|| RETURN_CODE=1
@@ -171,6 +180,11 @@ exit $RETURN_CODE
%changelog
+* Sun Jul 01 2018 Shawn Iwinski <shawn@iwin.ski> - 0.5.2-1
+- Update to 0.5.2 (RHBZ #1482155)
+- Add range version dependencies for Fedora >= 27 || RHEL >= 8
+- Add composer.json to repo
+
* Sat Apr 08 2017 Shawn Iwinski <shawn@iwin.ski> - 0.4.3-1
- Update to 0.4.3 (RHBZ #1432449)
generated by cgit (git 2.34.1) at 2024-11-22 05:07:32 +0000