php-bartlett-PHP-Reflect: fix reported version

2 files changed, 32 insertions, 9 deletions

diff --git a/php-bartlett-PHP-Reflect-3.0.0-rpm.patch b/php-bartlett-PHP-Reflect-3.0.0-rpm.patch
index 4b02fc4..ef7fd4a 100644
--- a/php-bartlett-PHP-Reflect-3.0.0-rpm.patch
+++ b/php-bartlett-PHP-Reflect-3.0.0-rpm.patch
@@ -1,6 +1,6 @@
 diff -up ./bin/phpreflect.rpm ./bin/phpreflect
---- ./bin/phpreflect.rpm	2015-02-03 11:38:30.000000000 +0100
-+++ ./bin/phpreflect	2015-02-04 14:45:45.995075976 +0100
+--- ./bin/phpreflect.rpm	2015-02-19 18:51:08.000000000 +0100
++++ ./bin/phpreflect	2015-02-22 11:32:38.272052909 +0100
 @@ -1,23 +1,35 @@
 -#!/usr/bin/env php
 +#!/usr/bin/php
@@ -46,9 +46,28 @@ diff -up ./bin/phpreflect.rpm ./bin/phpreflect
  
  if (PHP_SAPI !== 'cli') {
      return;
+@@ -28,5 +40,5 @@ use Bartlett\Reflect\Console\Application
+ 
+ Environment::setScanDir();
+ 
+-$application = new Application($appName, '3.0');
++$application = new Application($appName, '@package_version@');
+ $application->run();
+diff -up ./src/Bartlett/Reflect/Console/Application.php.rpm ./src/Bartlett/Reflect/Console/Application.php
+--- ./src/Bartlett/Reflect/Console/Application.php.rpm	2015-02-22 11:33:12.102190255 +0100
++++ ./src/Bartlett/Reflect/Console/Application.php	2015-02-22 11:33:24.298239771 +0100
+@@ -82,7 +82,7 @@ class Application extends BaseApplicatio
+             $jsonFile =  './' . getenv("BARTLETTRC");
+         }
+ 
+-        parent::__construct($appName, '@package_version@');
++        parent::__construct($appName, $appVersion);
+         $this->release = $appVersion;
+ 
+         $defaultAnalyser = (strcasecmp($appName, 'phpcompatinfo') === 0)
 diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm	2015-02-03 11:38:30.000000000 +0100
-+++ ./tests/bootstrap.php	2015-02-04 14:45:45.995075976 +0100
+--- ./tests/bootstrap.php.rpm	2015-02-19 18:51:08.000000000 +0100
++++ ./tests/bootstrap.php	2015-02-22 11:31:52.226865970 +0100
 @@ -1,11 +1,9 @@
  <?php
  
@@ -89,8 +108,8 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
 +    require_once $file;
 +}
 diff -up ./tests/Environment/YourLogger.php.rpm ./tests/Environment/YourLogger.php
---- ./tests/Environment/YourLogger.php.rpm	2015-02-03 11:38:30.000000000 +0100
-+++ ./tests/Environment/YourLogger.php	2015-02-04 14:48:07.609164546 +0100
+--- ./tests/Environment/YourLogger.php.rpm	2015-02-19 18:51:08.000000000 +0100
++++ ./tests/Environment/YourLogger.php	2015-02-22 11:31:52.226865970 +0100
 @@ -14,6 +14,7 @@ class YourLogger extends Logger
          if (!file_exists($tempDir)) {
              mkdir($tempDir, 0755, true);
diff --git a/php-bartlett-PHP-Reflect-dev.spec b/php-bartlett-PHP-Reflect-dev.spec
index 02326bf..766477f 100644
--- a/php-bartlett-PHP-Reflect-dev.spec
+++ b/php-bartlett-PHP-Reflect-dev.spec
@@ -11,10 +11,11 @@
 %global gh_date      20150219
 %global gh_owner     llaville
 %global gh_project   php-reflect
+%global prever       beta2
 
 Name:           php-bartlett-PHP-Reflect
 Version:        3.0.0
-%global specrel 6
+%global specrel 7
 Release:        %{?gh_short:0.%{specrel}.%{?gh_date}git%{gh_short}}%{!?gh_short:%{specrel}}%{?dist}
 Summary:        Adds the ability to reverse-engineer PHP
 
@@ -118,8 +119,8 @@ Documentation: http://php5.laurent-laville.org/reflect/manual/current/en/
 
 %patch0 -p1 -b .rpm
 
-sed -e 's/@package_version@/%{version}/' \
-    -i $(find src -name \*.php)
+sed -e 's/@package_version@/%{version}%{?prever}/' \
+    -i $(find src -name \*.php) bin/phpreflect
 
 
 %build
@@ -165,6 +166,9 @@ fi
 
 
 %changelog
+* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.7.20150219gite7f804e
+- fix reported version
+
 * Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 3.0.0-0.6.20150219gite7f804e
 - update to 3.0.0 beta2