From 43dfdb6c9a0bfb770cee9375d052eaf7d1adac30 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Nov 2017 08:40:15 +0100 Subject: Revert to 1.4.11 and bump Epoch to 1 --- composer.json | 10 +++------- php-phpunit-PHP-TokenStream.spec | 21 +++++++++++++-------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 4bf07e7..dfde729 100644 --- a/composer.json +++ b/composer.json @@ -15,15 +15,11 @@ "issues": "https://github.com/sebastianbergmann/php-token-stream/issues" }, "require": { - "php": "^7.0", + "php": ">=5.3.3", "ext-tokenizer": "*" }, "require-dev": { - "phpunit/phpunit": "^6.2.4" - }, - "config": { - "optimize-autoloader": true, - "sort-packages": true + "phpunit/phpunit": "~4.2" }, "autoload": { "classmap": [ @@ -32,7 +28,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "1.4-dev" } } } diff --git a/php-phpunit-PHP-TokenStream.spec b/php-phpunit-PHP-TokenStream.spec index 21c936c..9afff02 100644 --- a/php-phpunit-PHP-TokenStream.spec +++ b/php-phpunit-PHP-TokenStream.spec @@ -8,7 +8,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 9a02332089ac48e704c70f6cefed30c224e3c0b0 +%global gh_commit e03f8f67534427a787e21a385a67ec3ca6978ea7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-token-stream @@ -22,7 +22,8 @@ %endif Name: php-phpunit-PHP-TokenStream -Version: 2.0.1 +Epoch: 1 +Version: 1.4.11 Release: 1%{?dist} Summary: Wrapper around PHP tokenizer extension @@ -32,18 +33,18 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz BuildArch: noarch -BuildRequires: php(language) >= 7.0 +BuildRequires: php(language) >= 5.3.3 BuildRequires: php-fedora-autoloader-devel %if %{with_tests} -BuildRequires: phpunit6 >= 6.2 +BuildRequires: php-pear-PHPUnit >= 3.7.0 %endif # From composer.json -# "php": "^7.0", +# "php": ">=5.3.3", # "ext-tokenizer": "*" -Requires: php(language) >= 7.0 +Requires: php(language) >= 5.3.3 Requires: php-tokenizer -# From phpcompatinfo report for version 2.0.0 +# From phpcompatinfo report for version 1.4.11 Requires: php-pcre Requires: php-spl # Autoloader @@ -81,11 +82,12 @@ mkdir vendor touch vendor/autoload.php : Run upstream test suite +cd build ret=0 for cmd in php php70 php71 php72; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/PHP/Token/Stream/Autoload.php \ - %{_bindir}/phpunit6 --verbose || ret=1 + %{_bindir}/phpunit --verbose || ret=1 fi done exit $ret @@ -108,6 +110,9 @@ fi %changelog +* Mon Nov 6 2017 Remi Collet - 1:1.4.11-1 +- Revert to 1.4.11 and bump Epoch to 1 + * Mon Aug 21 2017 Remi Collet - 2.0.1-1 - Update to 2.0.1 -- cgit