remi pushed to php-phpunit-PHPUnit (f21). "ensure compatibility with SCL (..more)"

[notifications at fedoraproject.org]

From 9b7a98139c4576fcfd9e62d3d070d616fcf285f9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Tue, 26 May 2015 19:49:39 +0200
Subject: ensure compatibility with SCL

(cherry picked from commit 0ad0ba44cc43256b1bfdf728b860fa9ea0692ad1)

diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index 270fb5a..b1eec40 100644
--- a/php-phpunit-PHPUnit.spec
+++ b/php-phpunit-PHPUnit.spec
@@ -18,7 +18,7 @@
 
 Name:           php-phpunit-PHPUnit
 Version:        4.6.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The PHP Unit Testing framework
 
 Group:          Development/Libraries
@@ -197,6 +197,9 @@ fi
 
 
 %changelog
+* Tue May 26 2015 Remi Collet <remi at fedoraproject.org> - 4.6.7-3
+- ensure compatibility with SCL
+
 * Tue May 26 2015 Remi Collet <remi at fedoraproject.org> - 4.6.7-2
 - detect and redirect to composer installed version #1157910
 - Update to 4.6.7 (no change)
diff --git a/phpunit-rpm.patch b/phpunit-rpm.patch
index 7392971..46fd1ea 100644
--- a/phpunit-rpm.patch
+++ b/phpunit-rpm.patch
@@ -1,7 +1,6 @@
-diff -up ./phpunit.rpm ./phpunit
---- ./phpunit.rpm	2015-01-17 12:24:41.000000000 +0100
-+++ ./phpunit	2015-01-18 08:52:50.896228541 +0100
-@@ -13,22 +13,11 @@
+--- ./phpunit.rpm	2015-05-25 07:18:18.000000000 +0200
++++ ./phpunit	2015-05-26 19:43:34.101986869 +0200
+@@ -13,22 +13,21 @@
      ini_set('date.timezone', 'UTC');
  }
 
@@ -10,8 +9,15 @@ diff -up ./phpunit.rpm ./phpunit
 -        define('PHPUNIT_COMPOSER_INSTALL', $file);
 -        break;
 -    }
--}
--
++// Ensure correct include_path for RHSCL
++$inc = get_include_path();
++$dirs = explode(':', $inc);
++if (!in_array('/usr/share/php', $dirs)) {
++    $dirs[] = '/usr/share/php';
++    set_include_path(implode(':', $dirs));
+ }
++unset ($inc, $dirs);
+
 -unset($file);
 -
 -if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
@@ -21,6 +27,7 @@ diff -up ./phpunit.rpm ./phpunit
 -        'php composer.phar install' . PHP_EOL
 -    );
 -    die(1);
++// Libraries PATH
 +if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) {
 +  echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n";
 +  define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php'));
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-phpunit-PHPUnit.git/commit/?h=f21&id=9b7a98139c4576fcfd9e62d3d070d616fcf285f9