php-bartlett-PHP-Reflect: improve provided config

2 files changed, 41 insertions, 39 deletions

diff --git a/php-bartlett-PHP-Reflect-rpm.patch b/php-bartlett-PHP-Reflect-rpm.patch
index 6c5138b..b688ae2 100644
--- a/php-bartlett-PHP-Reflect-rpm.patch
+++ b/php-bartlett-PHP-Reflect-rpm.patch
@@ -1,6 +1,42 @@
+diff -up php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.json.rpm php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.json
+--- php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.json.rpm	2014-04-04 23:06:38.000000000 +0200
++++ php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.json	2014-05-12 20:19:30.876065361 +0200
+@@ -1,30 +1,8 @@
+ {
+     "source-providers": [
+         {
+-            "in": "phar:///var/compatinfo/branches/v3/examples/archives/PHP_CompatInfo-2.0.0.zip as CompatInfo",
+-            "name": "*.php",
+-            "path": "PHP/"
+-        },
+-        {
+-            "in": "phar:///var/compatinfo/branches/v3/examples/archives/PHP_Reflect-1.0.0.tar as Reflect",
+-            "path": "PHP/",
+-            "name": "*.php"
+-        },
+-        {
+-            "in": "phar:///var/compatinfo/branches/v3/examples/archives/PHP_Reflect-1.0.0.tar as ReflectAL",
+-            "path": "PHP/",
+-            "name": "Autoload.php"
+-        },
+-        {
+-            "in": "phar:///var/compatinfo/branches/v3/examples/archives/phing-2.6.1.tgz as phing",
+-            "name": "*.php",
+-            "path": "tasks/system",
+-            "notPath": "contrib/",
+-            "size": "< 4K"
+-        },
+-        {
+-            "in": "phar:///var/compatinfo/branches/v3/examples/archives/Zend-1.12.3.tgz as ZF1",
+-            "name": "*.php"
++                "in": ". as current",
++                "name": "/\\.(php|inc|phtml|module|install)$/"
+         }
+     ],
+     "plugins": [
 diff -up php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.rpm php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect
 --- php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.rpm	2014-04-04 23:06:38.000000000 +0200
-+++ php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect	2014-05-12 19:13:22.826673156 +0200
++++ php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect	2014-05-12 20:12:01.040407402 +0200
 @@ -1,31 +1,28 @@
 -#!/usr/bin/env php
 +#!/usr/bin/php
@@ -51,7 +87,7 @@ diff -up php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.rpm ph
  
 diff -up php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/tests/bootstrap.php.rpm php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/tests/bootstrap.php
 --- php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/tests/bootstrap.php.rpm	2014-04-04 23:06:38.000000000 +0200
-+++ php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/tests/bootstrap.php	2014-05-12 19:06:46.462068049 +0200
++++ php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/tests/bootstrap.php	2014-05-12 20:12:01.040407402 +0200
 @@ -1,20 +1,19 @@
  <?php
  
@@ -79,38 +115,3 @@ diff -up php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/tests/bootstrap.ph
  ));
 +$loader->useIncludePath(true);
  $loader->register();
-diff -up php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.json.rpm php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.json
---- php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.json.rpm	2014-05-12 19:21:03.396558078 +0200
-+++ php-reflect-b45be1d0d1b5a46253f9cda894dd7717f0a64abd/bin/reflect.json	2014-05-12 19:21:06.336569232 +0200
-@@ -1,31 +1,5 @@
- {
-     "source-providers": [
--        {
--            "in": "phar:///var/compatinfo/branches/v3/examples/archives/PHP_CompatInfo-2.0.0.zip as CompatInfo",
--            "name": "*.php",
--            "path": "PHP/"
--        },
--        {
--            "in": "phar:///var/compatinfo/branches/v3/examples/archives/PHP_Reflect-1.0.0.tar as Reflect",
--            "path": "PHP/",
--            "name": "*.php"
--        },
--        {
--            "in": "phar:///var/compatinfo/branches/v3/examples/archives/PHP_Reflect-1.0.0.tar as ReflectAL",
--            "path": "PHP/",
--            "name": "Autoload.php"
--        },
--        {
--            "in": "phar:///var/compatinfo/branches/v3/examples/archives/phing-2.6.1.tgz as phing",
--            "name": "*.php",
--            "path": "tasks/system",
--            "notPath": "contrib/",
--            "size": "< 4K"
--        },
--        {
--            "in": "phar:///var/compatinfo/branches/v3/examples/archives/Zend-1.12.3.tgz as ZF1",
--            "name": "*.php"
--        }
-     ],
-     "plugins": [
-         {
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 3d2141c..03cf22d 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -22,7 +22,7 @@ URL:            http://php5.laurent-laville.org/reflect/
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
 
 # Autoloader for RPM - die composer !
-Patch0:         php-bartlett-PHP-Reflect-rpm.patch
+Patch0:         %{name}-rpm.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -83,6 +83,7 @@ cp -pr src/Bartlett %{buildroot}%{_datadir}/php/Bartlett
 install -D -p -m 755 bin/reflect      %{buildroot}%{_bindir}/phpreflect
 install -D -p -m 644 bin/reflect.json %{buildroot}%{_sysconfdir}/phpreflect.json
 
+
 %check
 # Version 2.0.0 : OK (128 tests, 128 assertions)
 %{_bindir}/phpunit \
@@ -102,7 +103,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE
+%doc LICENSE composer.json README.*
 %config(noreplace) %{_sysconfdir}/phpreflect.json
 %{_bindir}/phpreflect
 %{_datadir}/php/Bartlett