summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-phpunit-PHPUnit.spec6
-rw-r--r--phpunit-rpm.patch6
2 files changed, 5 insertions, 7 deletions
diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index 6f2523a..bc18816 100644
--- a/php-phpunit-PHPUnit.spec
+++ b/php-phpunit-PHPUnit.spec
@@ -18,7 +18,7 @@
Name: php-phpunit-PHPUnit
Version: 4.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The PHP Unit Testing framework
Group: Development/Libraries
@@ -75,6 +75,7 @@ BuildRequires: php-composer(phpunit/php-invoker) >= 1.1.0
# "ext-reflection": "*",
# "ext-spl": "*"
Requires: php(language) >= 5.3.3
+Requires: php-cli
Requires: php-composer(phpunit/php-file-iterator) >= 1.4
Requires: php-composer(phpunit/php-file-iterator) < 2
Requires: php-composer(phpunit/php-text-template) >= 1.2
@@ -203,6 +204,9 @@ fi
%changelog
+* Fri Apr 17 2015 Remi Collet <remi@fedoraproject.org> - 4.6.4-2
+- keep upstream shebang with /usr/bin/env (for SCL)
+
* Mon Apr 13 2015 Remi Collet <remi@fedoraproject.org> - 4.6.4-1
- Update to 4.6.4
diff --git a/phpunit-rpm.patch b/phpunit-rpm.patch
index b927330..03ace66 100644
--- a/phpunit-rpm.patch
+++ b/phpunit-rpm.patch
@@ -1,12 +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
-@@ -1,4 +1,4 @@
--#!/usr/bin/env php
-+#!/usr/bin/php
- <?php
- /*
- * This file is part of PHPUnit.
@@ -13,24 +13,7 @@ if (!ini_get('date.timezone')) {
ini_set('date.timezone', 'UTC');
}