diff options
| -rw-r--r-- | php-bartlett-PHP-CompatInfo-rpm.patch | 6 | ||||
| -rw-r--r-- | php-bartlett-PHP-CompatInfo.spec | 20 |
2 files changed, 18 insertions, 8 deletions
diff --git a/php-bartlett-PHP-CompatInfo-rpm.patch b/php-bartlett-PHP-CompatInfo-rpm.patch index f35d15c..3b9f3c7 100644 --- a/php-bartlett-PHP-CompatInfo-rpm.patch +++ b/php-bartlett-PHP-CompatInfo-rpm.patch @@ -30,7 +30,7 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo <?php ini_set('memory_limit', -1); -@@ -23,7 +23,26 @@ if (\Phar::running()) { +@@ -23,7 +23,27 @@ if (\Phar::running()) { } } } @@ -40,6 +40,7 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo +PhpParser\Autoloader::register(); + +require_once $vendorDir . '/PHP/Timer.php'; ++require_once $vendorDir . '/SebastianBergmann/Version/Version.php'; + +require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; +use Symfony\Component\ClassLoader\UniversalClassLoader; @@ -61,7 +62,7 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php --- ./tests/bootstrap.php.rpm 2014-08-21 21:09:22.000000000 +0200 +++ ./tests/bootstrap.php 2014-08-22 08:30:12.203270207 +0200 -@@ -1,8 +1,29 @@ +@@ -1,8 +1,30 @@ <?php $baseDir = dirname(__DIR__); @@ -73,6 +74,7 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php +PhpParser\Autoloader::register(); +require_once $vendorDir . '/PHP/Timer.php'; ++require_once $vendorDir . '/SebastianBergmann/Version/Version.php'; + +require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php'; +use Symfony\Component\ClassLoader\UniversalClassLoader; diff --git a/php-bartlett-PHP-CompatInfo.spec b/php-bartlett-PHP-CompatInfo.spec index 92a4ac8..37cb6e4 100644 --- a/php-bartlett-PHP-CompatInfo.spec +++ b/php-bartlett-PHP-CompatInfo.spec @@ -6,13 +6,13 @@ # # Please, preserve the changelog entries # -%global gh_commit 4f9def9b616c3af1bb577c188b66f3039e8dd333 +%global gh_commit f537b51e9ca93213a458a1f2ac8d3cc9a4cb0054 #global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner llaville %global gh_project php-compat-info Name: php-bartlett-PHP-CompatInfo -Version: 3.4.0 +Version: 3.5.0 %global specrel 1 Release: %{?gh_short:0.%{specrel}.git%{gh_short}}%{!?gh_short:%{specrel}}%{?dist} Summary: Find out version and the extensions required for a piece of code to run @@ -30,7 +30,7 @@ BuildArch: noarch BuildRequires: php(language) >= 5.3.0 # to run test suite BuildRequires: %{_bindir}/phpunit -BuildRequires: php-composer(bartlett/php-reflect) >= 2.4 +BuildRequires: php-composer(bartlett/php-reflect) >= 2.5 # From composer.json, "require" # "php": ">=5.3.0", @@ -39,19 +39,21 @@ BuildRequires: php-composer(bartlett/php-reflect) >= 2.4 # "ext-spl": "*", # "ext-json": "*", # "symfony/console": "~2.5", -# "bartlett/php-reflect": "~2.4", -# "seld/jsonlint": "~1.1" +# "bartlett/php-reflect": "~2.5", +# "seld/jsonlint": "~1.1" Requires: php(language) >= 5.3.0 Requires: php-json Requires: php-libxml Requires: php-pcre Requires: php-spl -Requires: php-composer(bartlett/php-reflect) >= 2.4 +Requires: php-composer(bartlett/php-reflect) >= 2.5 Requires: php-composer(bartlett/php-reflect) < 3 Requires: php-composer(symfony/console) >= 2.5 Requires: php-composer(symfony/console) < 3 Requires: php-composer(seld/jsonlint) >= 1.1 Requires: php-composer(seld/jsonlint) < 2 +Requires: php-composer(sebastian/version) >= 1.0 +Requires: php-composer(sebastian/version) < 2 # From composer.json, "suggest" # "doctrine/cache": "Allow caching results, since bartlett/php-reflect 2.2" Requires: php-composer(doctrine/cache) @@ -130,8 +132,14 @@ fi %changelog +* Thu Oct 16 2014 Remi Collet <remi@fedoraproject.org> - 3.5.0-1 +- Update to 3.5.0 +- add dependency on sebastian/version +- raise dependency on bartlett/php-reflect 2.5 + * Thu Sep 25 2014 Remi Collet <remi@fedoraproject.org> - 3.4.0-1 - Update to 3.4.0 +- raise dependency on bartlett/php-reflect 2.4 * Wed Sep 24 2014 Remi Collet <remi@fedoraproject.org> - 3.4.0-0.1.ded22dc - Test build of upcoming 3.4.0 |