php-bartlett-PHP-Reflect: 2.2.0 WIP

2 files changed, 12 insertions, 44 deletions

diff --git a/php-bartlett-PHP-Reflect-rpm.patch b/php-bartlett-PHP-Reflect-rpm.patch
index fcf5ffd..ceb0739 100644
--- a/php-bartlett-PHP-Reflect-rpm.patch
+++ b/php-bartlett-PHP-Reflect-rpm.patch
@@ -1,43 +1,12 @@
-diff -up ./bin/phpreflect.json.rpm ./bin/phpreflect.json
---- ./bin/phpreflect.json.rpm	2014-07-04 20:47:50.000000000 +0200
-+++ ./bin/phpreflect.json	2014-07-08 10:41:15.517221093 +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 ./bin/phpreflect.rpm ./bin/phpreflect
---- ./bin/phpreflect.rpm	2014-07-08 10:41:15.517221093 +0200
-+++ ./bin/phpreflect	2014-07-08 10:49:23.585395326 +0200
-@@ -5,7 +5,7 @@ if (\Phar::running()) {
+--- ./bin/phpreflect.rpm	2014-07-23 17:49:46.000000000 +0200
++++ ./bin/phpreflect	2014-07-24 07:32:27.586541797 +0200
+@@ -1,11 +1,11 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ if (\Phar::running()) {
      $vendorDir = 'phar://phpreflect.phar/vendor';
  } else {
      $baseDir   = dirname(__DIR__);
@@ -73,8 +42,8 @@ diff -up ./bin/phpreflect.rpm ./bin/phpreflect
  if (PHP_SAPI !== 'cli') {
      return;
 diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm	2014-07-08 10:41:15.517221093 +0200
-+++ ./tests/bootstrap.php	2014-07-08 10:45:43.280413655 +0200
+--- ./tests/bootstrap.php.rpm	2014-07-23 17:49:46.000000000 +0200
++++ ./tests/bootstrap.php	2014-07-24 07:32:12.151469115 +0200
 @@ -1,6 +1,19 @@
  <?php
  
diff --git a/php-bartlett-PHP-Reflect.spec b/php-bartlett-PHP-Reflect.spec
index 35d9ca4..16a6af9 100644
--- a/php-bartlett-PHP-Reflect.spec
+++ b/php-bartlett-PHP-Reflect.spec
@@ -69,10 +69,11 @@ Requires:       php-composer(doctrine/cache)           <  2
 # For our patch
 Requires:       php-composer(symfony/class-loader)     >= 2.5
 Requires:       php-composer(symfony/class-loader)     <  3
-
 # From package.xml
 Requires:       php-reflection
 
+Provides:       php-composer(bartlett/php-reflect) = %{version}
+
 
 %description
 PHP_Reflect adds the ability to reverse-engineer classes, interfaces,
@@ -86,8 +87,6 @@ Documentation: http://php5.laurent-laville.org/reflect/manual/2.0/en/
 
 %patch0 -p1 -b .rpm
 
-find . -type f -name \*.rpm -print | xargs rm
-
 sed -e 's/@package_version@/%{version}/' \
     -i $(find src -name \*.php)