summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--php-bartlett-PHP-Reflect-autoload.php6
-rw-r--r--php-bartlett-PHP-Reflect.spec21
3 files changed, 30 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/php-bartlett-PHP-Reflect-autoload.php b/php-bartlett-PHP-Reflect-autoload.php
index 5f23681..53aeafa 100644
--- a/php-bartlett-PHP-Reflect-autoload.php
+++ b/php-bartlett-PHP-Reflect-autoload.php
@@ -14,7 +14,10 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
'/usr/share/php/SebastianBergmann/Version/autoload.php',
'/usr/share/php/Doctrine/Common/Collections/autoload.php',
'/usr/share/php/Doctrine/Common/Cache/autoload.php',
- '/usr/share/php/phpDocumentor/Reflection/DocBlock/autoload.php',
+ array(
+ '/usr/share/php/phpDocumentor/Reflection/DocBlock2/autoload.php',
+ '/usr/share/php/phpDocumentor/Reflection/DocBlock/autoload.php',
+ ),
));
\Fedora\Autoloader\Dependencies::optional(array(
'/usr/share/php/Bartlett/CompatInfo/autoload.php', // Needed when installed for 'Bartlett\CompatInfo\Analyser\CompatibilityAnalyser'
@@ -24,4 +27,3 @@ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
));
$vendorDir = '/usr/share/php';
-
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 010567d..984f46a 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -21,7 +21,7 @@
Name: php-bartlett-PHP-Reflect
Version: 4.0.2
-%global specrel 2
+%global specrel 3
Release: %{?gh_date:0.%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: Adds the ability to reverse-engineer PHP
@@ -42,19 +42,29 @@ BuildRequires: php(language) >= 5.4.0
# to run test suite
BuildRequires: %{_bindir}/phpunit
BuildRequires: php-composer(sebastian/version) >= 1.0
+BuildRequires: php-composer(sebastian/version) < 3
BuildRequires: php-composer(nikic/php-parser) >= 1.4
BuildRequires: php-composer(nikic/php-parser) < 2
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) < 3
BuildRequires: php-composer(symfony/finder) >= 2.5
+BuildRequires: php-composer(symfony/finder) < 3
BuildRequires: php-composer(symfony/console) >= 2.5
+BuildRequires: php-composer(symfony/console) < 3
BuildRequires: php-composer(symfony/stopwatch) >= 2.5
+BuildRequires: php-composer(symfony/stopwatch) < 3
BuildRequires: php-composer(symfony/dependency-injection) >= 2.5
+BuildRequires: php-composer(symfony/dependency-injection) < 3
BuildRequires: php-composer(phpdocumentor/reflection-docblock) >= 2.0
+BuildRequires: php-composer(phpdocumentor/reflection-docblock) < 3
BuildRequires: php-composer(seld/jsonlint) >= 1.1
+BuildRequires: php-composer(seld/jsonlint) < 2
BuildRequires: php-composer(justinrainbow/json-schema) >= 1.3
BuildRequires: php-composer(justinrainbow/json-schema) < 2
BuildRequires: php-composer(monolog/monolog) >= 1.10
+BuildRequires: php-composer(monolog/monolog) < 2
# For our patch / autoloader
BuildRequires: php-doctrine-collections >= 1.3.0-2
BuildRequires: php-doctrine-cache >= 1.4.1
@@ -124,7 +134,9 @@ Requires: php-composer(justinrainbow/json-schema) < 2
# "bartlett/phpunit-loggertestlistener": "Allow logging unit tests to your favorite PSR-3 logger interface",
# "bartlett/umlwriter": "Allow writing UML class diagrams (Graphviz or PlantUML)"
Requires: php-composer(doctrine/cache) >= 1.3
+Requires: php-composer(doctrine/cache) < 2
Requires: php-composer(psr/log) >= 1.0
+Requires: php-composer(psr/log) < 2
%if ! %{bootstrap}
Requires: php-composer(bartlett/umlwriter) >= 1.0
Requires: php-composer(bartlett/umlwriter) < 2
@@ -219,6 +231,12 @@ fi
%changelog
+* Thu Apr 13 2017 Shawn Iwinski <shawn@iwin.ski> - 4.0.2-3
+- Add max versions to BuildRequires
+- Prepare for Symfony 3
+- Prepare for php-phpdocumentor-reflection-docblock =>
+ php-phpdocumentor-reflection-docblock2 dependency rename
+
* Mon Oct 31 2016 Remi Collet <remi@fedoraproject.org> - 4.0.2-2
- switch to fedora/autoloader
@@ -445,4 +463,3 @@ fi
* Fri Feb 25 2011 Remi Collet <Fedora@FamilleCollet.com> - 0.4.0-1
- Version 0.4.0 (beta)
- Initial RPM package
-