summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-02-22 11:47:05 +0100
committerRemi Collet <fedora@famillecollet.com>2015-02-22 11:47:05 +0100
commit602ad1b2534318ff26e962ad047c70bf5d50b680 (patch)
treedd423e77bc64c0147e591a692a74e279c9ef1c15
parentfa1b616aa32ca107e061032514b2c4cc18041be4 (diff)
php-bartlett-PHP-CompatInfo: fix reported version
-rw-r--r--php-bartlett-PHP-CompatInfo-4.0.0-rpm.patch15
-rw-r--r--php-bartlett-PHP-CompatInfo-dev.spec10
2 files changed, 18 insertions, 7 deletions
diff --git a/php-bartlett-PHP-CompatInfo-4.0.0-rpm.patch b/php-bartlett-PHP-CompatInfo-4.0.0-rpm.patch
index 455742d..b5774a2 100644
--- a/php-bartlett-PHP-CompatInfo-4.0.0-rpm.patch
+++ b/php-bartlett-PHP-CompatInfo-4.0.0-rpm.patch
@@ -1,6 +1,6 @@
diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
--- ./bin/phpcompatinfo.rpm 2015-02-20 10:59:04.000000000 +0100
-+++ ./bin/phpcompatinfo 2015-02-22 09:37:46.130869824 +0100
++++ ./bin/phpcompatinfo 2015-02-22 11:42:38.671479626 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env php
+#!/usr/bin/php
@@ -38,9 +38,16 @@ diff -up ./bin/phpcompatinfo.rpm ./bin/phpcompatinfo
if (PHP_SAPI !== 'cli') {
return;
+@@ -28,5 +48,5 @@ use Bartlett\CompatInfo\Console\Applicat
+
+ Environment::setScanDir();
+
+-$application = new Application($appName, '4.0');
++$application = new Application($appName, '@package_version@');
+ $application->run();
diff -up ./data/handleDB.php.rpm ./data/handleDB.php
--- ./data/handleDB.php.rpm 2015-02-20 10:59:04.000000000 +0100
-+++ ./data/handleDB.php 2015-02-22 09:36:34.008567158 +0100
++++ ./data/handleDB.php 2015-02-22 11:42:15.277385330 +0100
@@ -11,7 +11,18 @@
* @since Release 4.0.0alpha3
*/
@@ -63,7 +70,7 @@ diff -up ./data/handleDB.php.rpm ./data/handleDB.php
use Bartlett\CompatInfo\Reference\ExtensionFactory;
diff -up ./src/Bartlett/CompatInfo/Environment.php.rpm ./src/Bartlett/CompatInfo/Environment.php
--- ./src/Bartlett/CompatInfo/Environment.php.rpm 2015-02-20 10:59:04.000000000 +0100
-+++ ./src/Bartlett/CompatInfo/Environment.php 2015-02-22 09:36:34.008567158 +0100
++++ ./src/Bartlett/CompatInfo/Environment.php 2015-02-22 11:42:15.277385330 +0100
@@ -34,6 +34,10 @@ class Environment
*/
public static function initRefDb()
@@ -77,7 +84,7 @@ diff -up ./src/Bartlett/CompatInfo/Environment.php.rpm ./src/Bartlett/CompatInfo
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
--- ./tests/bootstrap.php.rpm 2015-02-20 10:59:04.000000000 +0100
-+++ ./tests/bootstrap.php 2015-02-22 09:36:34.008567158 +0100
++++ ./tests/bootstrap.php 2015-02-22 11:42:15.277385330 +0100
@@ -1,8 +1,30 @@
<?php
diff --git a/php-bartlett-PHP-CompatInfo-dev.spec b/php-bartlett-PHP-CompatInfo-dev.spec
index 6036725..0f28d08 100644
--- a/php-bartlett-PHP-CompatInfo-dev.spec
+++ b/php-bartlett-PHP-CompatInfo-dev.spec
@@ -11,10 +11,11 @@
%global gh_date 20150220
%global gh_owner llaville
%global gh_project php-compat-info
+%global prever beta2
Name: php-bartlett-PHP-CompatInfo
Version: 4.0.0
-%global specrel 4
+%global specrel 5
Release: %{?gh_short:0.%{specrel}.%{?gh_date}git%{gh_short}}%{!?gh_short:%{specrel}}%{?dist}
Summary: Find out version and the extensions required for a piece of code to run
@@ -89,8 +90,8 @@ Documentation: http://php5.laurent-laville.org/compatinfo/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/phpcompatinfo
%build
@@ -138,6 +139,9 @@ fi
%changelog
+* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.5.20150220git442d25d
+- fix reported version
+
* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.4.20150220git442d25d
- update to 4.0.0beta2