diff options
| -rw-r--r-- | composer.json | 5 | ||||
| l--------- | makesrc.sh | 1 | ||||
| -rw-r--r-- | php-amqplib.spec | 19 |
3 files changed, 16 insertions, 9 deletions
diff --git a/composer.json b/composer.json index cc8ae63..ed41ed0 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,8 @@ "require-dev": { "phpunit/phpunit": "^4.8", "scrutinizer/ocular": "^1.1", - "squizlabs/php_codesniffer": "^2.5" + "squizlabs/php_codesniffer": "^2.5", + "phpdocumentor/phpdocumentor": "^2.9" }, "suggest": { "ext-sockets": "Use AMQPSocketConnection" @@ -47,7 +48,7 @@ "PhpAmqpLib\\Tests\\Unit\\": "tests/Unit" } }, - "license": "LGPL-2.1", + "license": "LGPL-2.1-or-later", "extra": { "branch-alias": { "dev-master": "2.7-dev" diff --git a/makesrc.sh b/makesrc.sh new file mode 120000 index 0000000..8390945 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1 @@ +php-amqplib-get-source.sh
\ No newline at end of file diff --git a/php-amqplib.spec b/php-amqplib.spec index 1352351..fa12f16 100644 --- a/php-amqplib.spec +++ b/php-amqplib.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-php-amqplib-php-amqplib # -# Copyright (c) 2017 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2017-2019 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner php-amqplib %global github_name php-amqplib -%global github_version 2.7.0 -%global github_commit f48748546e398d846134c594dfca9070c4c3b356 +%global github_version 2.7.3 +%global github_commit a8ba54bd35b973fc6861e4c2e105f71e9e95f43f %global composer_vendor php-amqplib %global composer_project php-amqplib @@ -28,11 +28,10 @@ Name: %{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: Pure PHP implementation of the AMQP protocol -Group: Development/Libraries -License: LGPLv2 +License: LGPLv2+ URL: https://github.com/%{github_owner}/%{github_name} # GitHub export does not include tests. @@ -124,6 +123,8 @@ cat <<'BOOTSTRAP' | tee bootstrap.php date_default_timezone_set('UTC'); require '%{buildroot}%{phpdir}/PhpAmqpLib/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('PhpAmqpLib\\Tests\\Unit\\', __DIR__.'/tests/Unit'); + +class_alias('PHPUnit_Framework_TestCase', 'PHPUnit\\Framework\\TestCase'); BOOTSTRAP : Remove tests requiring a running AMQP service @@ -132,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; do if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ --testsuite="Unit Tests" || RETURN_CODE=1 @@ -153,6 +154,10 @@ exit $RETURN_CODE %changelog +* Fri May 10 2019 Shawn Iwinski <shawn@iwin.ski> - 2.7.3-1 +- Update to 2.7.3 +- Update license from LGPLv2 to LGPLv2+ + * Fri Nov 03 2017 Shawn Iwinski <shawn@iwin.ski> - 2.7.0-2 - Set default timezone in tests' bootstrap |