summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-05-27 13:48:43 +0200
committerRemi Collet <remi@remirepo.net>2019-05-27 13:48:43 +0200
commit8fcbe352905ad12d37b565421f15a02e518c58a9 (patch)
tree96ade979c615eabc50f52189b3bcd03d0d409293
parent48453e9648cb2ad980f7ab4099ad9e6f02c97d3e (diff)
*v2.9.2 from FedoraHEADmaster
-rw-r--r--php-amqplib.spec31
1 files changed, 17 insertions, 14 deletions
diff --git a/php-amqplib.spec b/php-amqplib.spec
index fa12f16..48f5f54 100644
--- a/php-amqplib.spec
+++ b/php-amqplib.spec
@@ -1,6 +1,6 @@
-# remirepo spec file for php-php-amqplib-php-amqplib, from:
+# remirepo spec file for php-amqplib, from:
#
-# Fedora spec file for php-php-amqplib-php-amqplib
+# Fedora spec file for php-amqplib
#
# Copyright (c) 2017-2019 Shawn Iwinski <shawn@iwin.ski>
#
@@ -12,14 +12,14 @@
%global github_owner php-amqplib
%global github_name php-amqplib
-%global github_version 2.7.3
-%global github_commit a8ba54bd35b973fc6861e4c2e105f71e9e95f43f
+%global github_version 2.9.2
+%global github_commit 76faddcd668dabb8d4f7c00e86b8a9decd781a59
%global composer_vendor php-amqplib
%global composer_project php-amqplib
-# "php": ">=5.3.0"
-%global php_min_ver 5.3.0
+# "php": ">=5.4.0"
+%global php_min_ver 5.4.0
# Build using "--without tests" to disable tests
%global with_tests 0%{!?_without_tests:1}
@@ -46,11 +46,11 @@ BuildArch: noarch
BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
BuildRequires: php-bcmath
-BuildRequires: php-mbstring
BuildRequires: php-sockets
-## phpcompatinfo for version 2.7.0
+## phpcompatinfo for version 2.9.2
BuildRequires: php-date
BuildRequires: php-json
+BuildRequires: php-mbstring
BuildRequires: php-pcntl
BuildRequires: php-pcre
BuildRequires: php-reflection
@@ -62,11 +62,11 @@ BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
Requires: php-bcmath
-Requires: php-mbstring
-# composer.json: suggest
Requires: php-sockets
-# phpcompatinfo for version 2.7.0
+# phpcompatinfo for version 2.9.2
Requires: php-date
+Requires: php-mbstring
+Requires: php-pcntl
Requires: php-pcre
Requires: php-spl
# Autoloader
@@ -122,9 +122,9 @@ cat <<'BOOTSTRAP' | tee bootstrap.php
<?php
date_default_timezone_set('UTC');
require '%{buildroot}%{phpdir}/PhpAmqpLib/autoload.php';
-\Fedora\Autoloader\Autoload::addPsr4('PhpAmqpLib\\Tests\\Unit\\', __DIR__.'/tests/Unit');
+require __DIR__.'/tests/config.php';
-class_alias('PHPUnit_Framework_TestCase', 'PHPUnit\\Framework\\TestCase');
+\Fedora\Autoloader\Autoload::addPsr4('PhpAmqpLib\\Tests\\Unit\\', __DIR__.'/tests/Unit');
BOOTSTRAP
: Remove tests requiring a running AMQP service
@@ -133,7 +133,7 @@ rm -f tests/Unit/Wire/IO/SocketIOTest.php
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit)
-for PHP_EXEC in php %{?rhel:php54 php55 php56 php70} php71 php72; do
+for PHP_EXEC in php %{?rhel:php54 php55 php56 php70} php71 php72 php73 php74; do
if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
--testsuite="Unit Tests" || RETURN_CODE=1
@@ -154,6 +154,9 @@ exit $RETURN_CODE
%changelog
+* Sun May 26 2019 Shawn Iwinski <shawn@iwin.ski> - 2.9.2-1
+- Update to 2.9.2 (RHBZ #1535736)
+
* Fri May 10 2019 Shawn Iwinski <shawn@iwin.ski> - 2.7.3-1
- Update to 2.7.3
- Update license from LGPLv2 to LGPLv2+