summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json36
-rw-r--r--php-bartlett-PHP-Reflect-4.0.0-rpm.patch2
-rw-r--r--php-bartlett-PHP-Reflect.spec68
3 files changed, 53 insertions, 53 deletions
diff --git a/composer.json b/composer.json
index 401c7dc..73916d8 100644
--- a/composer.json
+++ b/composer.json
@@ -24,26 +24,26 @@
"ext-json": "*",
"ext-date": "*",
"ext-reflection": "*",
- "sebastian/version": "~1.0|~2.0",
- "nikic/php-parser": "~2.1",
- "doctrine/collections": "~1.2",
- "symfony/event-dispatcher": "~2.5|~3.0",
- "symfony/finder": "~2.5|~3.0",
- "symfony/console": "~2.5|~3.0",
- "symfony/stopwatch": "~2.5|~3.0",
- "symfony/dependency-injection": "~2.5|~3.0",
- "phpdocumentor/reflection-docblock": "~3.0",
- "justinrainbow/json-schema": "~1.3",
- "seld/jsonlint": "~1.1"
+ "sebastian/version": "^1.0|^2.0",
+ "nikic/php-parser": "^2.1",
+ "doctrine/collections": ">=1.2 <1.5",
+ "symfony/event-dispatcher": "^2.5|^3.0",
+ "symfony/finder": "^2.5|^3.0",
+ "symfony/console": "^2.5|^3.0",
+ "symfony/stopwatch": "^2.5|^3.0",
+ "symfony/dependency-injection": "^2.5|^3.0",
+ "phpdocumentor/reflection-docblock": "^3.0",
+ "justinrainbow/json-schema": "^1.3",
+ "seld/jsonlint": "^1.1"
},
"require-dev": {
- "doctrine/cache": "~1.3",
- "psr/log": "~1.0",
- "monolog/monolog": "~1.10",
- "bartlett/monolog-callbackfilterhandler": "~1.0",
- "bartlett/monolog-growlhandler": "~1.0",
- "bartlett/phpunit-loggertestlistener": "~1.5",
- "bartlett/umlwriter": "~1.0"
+ "doctrine/cache": "^1.3",
+ "psr/log": "^1.0",
+ "monolog/monolog": "^1.10",
+ "bartlett/monolog-callbackfilterhandler": "^1.0",
+ "bartlett/monolog-growlhandler": "^1.0",
+ "bartlett/phpunit-loggertestlistener": "^1.5",
+ "bartlett/umlwriter": "^1.0"
},
"suggest": {
"doctrine/cache": "Allow caching results",
diff --git a/php-bartlett-PHP-Reflect-4.0.0-rpm.patch b/php-bartlett-PHP-Reflect-4.0.0-rpm.patch
index 4ac7137..ac1ae15 100644
--- a/php-bartlett-PHP-Reflect-4.0.0-rpm.patch
+++ b/php-bartlett-PHP-Reflect-4.0.0-rpm.patch
@@ -71,7 +71,7 @@ diff -up ./bin/phpreflect.rpm ./bin/phpreflect
Environment::setScanDir();
--$application = new Application($appName, '4.0');
+-$application = new Application($appName, '4.2');
+$application = new Application($appName, '@package_version@');
$application->run();
diff -up ./src/Bartlett/Reflect/Console/Application.php.rpm ./src/Bartlett/Reflect/Console/Application.php
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 31c674d..70242ba 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 458d9deef8ce3b96e7f51164b9e00507d8cd575b
+%global gh_commit c6804456bf956a75470b9714936f99a316d9f32d
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20150331
%global gh_owner llaville
@@ -19,9 +19,15 @@
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
%endif
+%if 0%{?fedora} >= 27
+%global sym_prefix php-symfony3
+%else
+%global sym_prefix php-symfony
+%endif
+
Name: php-bartlett-PHP-Reflect
-Version: 4.1.0
-%global specrel 2
+Version: 4.2.0
+%global specrel 1
Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Adds the ability to reverse-engineer PHP
@@ -46,16 +52,11 @@ BuildRequires: php-composer(sebastian/version) < 3
BuildRequires: php-nikic-php-parser
BuildRequires: php-composer(doctrine/collections) >= 1.2
BuildRequires: php-composer(doctrine/collections) < 2
-BuildRequires: php-composer(symfony/event-dispatcher) >= 2.5
-BuildRequires: php-composer(symfony/event-dispatcher) < 4
-BuildRequires: php-composer(symfony/finder) >= 2.5
-BuildRequires: php-composer(symfony/finder) < 4
-BuildRequires: php-composer(symfony/console) >= 2.5
-BuildRequires: php-composer(symfony/console) < 4
-BuildRequires: php-composer(symfony/stopwatch) >= 2.5
-BuildRequires: php-composer(symfony/stopwatch) < 4
-BuildRequires: php-composer(symfony/dependency-injection) >= 2.5
-BuildRequires: php-composer(symfony/dependency-injection) < 4
+BuildRequires: %{sym_prefix}-event-dispatcher
+BuildRequires: %{sym_prefix}-finder
+BuildRequires: %{sym_prefix}-console
+BuildRequires: %{sym_prefix}-stopwatch
+BuildRequires: %{sym_prefix}-dependency-injection
BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= 3.0
BuildRequires: php-composer(phpdocumentor/reflection-docblock) < 4
BuildRequires: php-composer(seld/jsonlint) >= 1.1
@@ -78,17 +79,17 @@ BuildRequires: php-composer(fedora/autoloader)
# "ext-json": "*",
# "ext-date": "*",
# "ext-reflection": "*",
-# "sebastian/version": "~1.0|~2.0",
-# "nikic/php-parser": "~2.1",
-# "doctrine/collections": "~1.2",
-# "symfony/event-dispatcher": "~2.5|~3.0",
-# "symfony/finder": "~2.5|~3.0",
-# "symfony/console": "~2.5|~3.0"
-# "symfony/stopwatch": "~2.5|~3.0",
-# "symfony/dependency-injection": "~2.5|~3.0",
-# "phpdocumentor/reflection-docblock": "~3.0",
-# "justinrainbow/json-schema": "~1.3",
-# "seld/jsonlint": "~1.1"
+# "sebastian/version": "^1.0|^2.0",
+# "nikic/php-parser": "^2.1",
+# "doctrine/collections": ">=1.2 <1.5",
+# "symfony/event-dispatcher": "^2.5|^3.0",
+# "symfony/finder": "^2.5|^3.0",
+# "symfony/console": "^2.5|^3.0",
+# "symfony/stopwatch": "^2.5|^3.0",
+# "symfony/dependency-injection": "^2.5|^3.0",
+# "phpdocumentor/reflection-docblock": "^3.0",
+# "justinrainbow/json-schema": "^1.3",
+# "seld/jsonlint": "^1.1"
Requires: php(language) >= 5.4.0
Requires: php-cli
Requires: php-date
@@ -103,16 +104,11 @@ Requires: php-composer(sebastian/version) < 3
Requires: php-nikic-php-parser
Requires: php-composer(doctrine/collections) >= 1.2
Requires: php-composer(doctrine/collections) < 2
-Requires: php-composer(symfony/event-dispatcher) >= 2.5
-Requires: php-composer(symfony/event-dispatcher) < 4
-Requires: php-composer(symfony/finder) >= 2.5
-Requires: php-composer(symfony/finder) < 4
-Requires: php-composer(symfony/console) >= 2.5
-Requires: php-composer(symfony/console) < 4
-Requires: php-composer(symfony/stopwatch) >= 2.5
-Requires: php-composer(symfony/stopwatch) < 4
-Requires: php-composer(symfony/dependency-injection) >= 2.5
-Requires: php-composer(symfony/dependency-injection) < 4
+Requires: %{sym_prefix}-event-dispatcher
+Requires: %{sym_prefix}-finder
+Requires: %{sym_prefix}-console
+Requires: %{sym_prefix}-stopwatch
+Requires: %{sym_prefix}-dependency-injection
Requires: php-composer(phpdocumentor/reflection-docblock) >= 3.0
Requires: php-composer(phpdocumentor/reflection-docblock) < 4
Requires: php-composer(seld/jsonlint) >= 1.1
@@ -218,6 +214,10 @@ fi
%changelog
+* Tue Dec 12 2017 Remi Collet <remi@remirepo.net> - 4.2.0-1
+- Update to 4.2.0
+- only require a single Symfony version
+
* Thu Oct 5 2017 Remi Collet <remi@remirepo.net> - 4.1.0-2
- fix autoloader for Symfony 3, FTBFS from Koschei
generated by cgit (git 2.34.1) at 2024-06-03 12:07:52 +0000