diff options
| -rw-r--r-- | php-bartlett-PHP-Reflect-3.0.0-fix.patch | 18 | ||||
| -rw-r--r-- | php-bartlett-PHP-Reflect-dev.spec | 9 |
2 files changed, 26 insertions, 1 deletions
diff --git a/php-bartlett-PHP-Reflect-3.0.0-fix.patch b/php-bartlett-PHP-Reflect-3.0.0-fix.patch new file mode 100644 index 0000000..f3a23cd --- /dev/null +++ b/php-bartlett-PHP-Reflect-3.0.0-fix.patch @@ -0,0 +1,18 @@ +diff -up src/Bartlett/Reflect/Output/Analyser.php.orig src/Bartlett/Reflect/Output/Analyser.php +--- src/Bartlett/Reflect/Output/Analyser.php.orig 2015-02-23 19:34:38.068134005 +0100 ++++ src/Bartlett/Reflect/Output/Analyser.php 2015-02-23 19:35:15.053282071 +0100 +@@ -95,12 +95,12 @@ class Analyser extends OutputFormatter + continue; + } + $baseNamespace = str_replace( +- 'Analyser\\' . basename($analyserName), ++ 'Analyser\\' . basename(str_replace('\\', '/', $analyserName)), + '', + $analyserName + ); + $outputFormatter = $baseNamespace . 'Console\Formatter\\' . +- substr(basename($analyserName), 0, -8) . 'OutputFormatter'; ++ substr(basename(str_replace('\\', '/', $analyserName)), 0, -8) . 'OutputFormatter'; + + if (class_exists($outputFormatter)) { + $obj = new $outputFormatter(); diff --git a/php-bartlett-PHP-Reflect-dev.spec b/php-bartlett-PHP-Reflect-dev.spec index 766477f..89abff1 100644 --- a/php-bartlett-PHP-Reflect-dev.spec +++ b/php-bartlett-PHP-Reflect-dev.spec @@ -15,7 +15,7 @@ Name: php-bartlett-PHP-Reflect Version: 3.0.0 -%global specrel 7 +%global specrel 8 Release: %{?gh_short:0.%{specrel}.%{?gh_date}git%{gh_short}}%{!?gh_short:%{specrel}}%{?dist} Summary: Adds the ability to reverse-engineer PHP @@ -28,6 +28,9 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # Enable cache plugin Patch0: %{name}-3.0.0-rpm.patch +# https://github.com/llaville/php-compat-info/issues/152#issuecomment-75601446 +Patch1: %{name}-3.0.0-fix.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: php(language) >= 5.3 @@ -118,6 +121,7 @@ Documentation: http://php5.laurent-laville.org/reflect/manual/current/en/ %setup -q -n %{gh_project}-%{gh_commit} %patch0 -p1 -b .rpm +%patch1 -p0 -b .fix sed -e 's/@package_version@/%{version}%{?prever}/' \ -i $(find src -name \*.php) bin/phpreflect @@ -166,6 +170,9 @@ fi %changelog +* Mon Feb 23 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.8.20150219gite7f804e +- fix output + * Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.7.20150219gite7f804e - fix reported version |