summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-03-30 10:49:53 +0200
committerRemi Collet <fedora@famillecollet.com>2017-03-30 10:49:53 +0200
commitac3b3035ae8d3860c6851f8729021a5d539beac4 (patch)
tree67efcbb53e2db30bcde01d168f32bba2cb6a5f7b
parent80583e0b30672207ba06ad5ec94723eeaa463836 (diff)
use fedora2 autoloader template
-rw-r--r--phpunit6.spec13
1 files changed, 6 insertions, 7 deletions
diff --git a/phpunit6.spec b/phpunit6.spec
index 28f79a3..f15ae08 100644
--- a/phpunit6.spec
+++ b/phpunit6.spec
@@ -21,7 +21,7 @@
%global ver_major 6
%global ver_minor 0
%global ver_patch 11
-%global specrel 1
+%global specrel 2
Name: %{pk_project}%{ver_major}
Version: %{ver_major}.%{ver_minor}.%{ver_patch}
@@ -75,7 +75,7 @@ BuildRequires: php-xml
BuildRequires: php-libxml
BuildRequires: php-composer(phpunit/php-invoker) >= 1.1.0
# Autoloader
-BuildRequires: php-fedora-autoloader-devel
+BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# From composer.json, "require": {
# "php": "^7.0",
@@ -176,14 +176,10 @@ It is an instance of the xUnit architecture for unit testing frameworks.
%build
%{_bindir}/phpab \
- --template fedora \
+ --template fedora2 \
--output src/autoload.php \
src
-# Rely on include_path as in PHPUnit dependencies
-# TODO use template2 with fedora/autoloader 1.0.0
-sed -e 's:/usr/share/php/::' -i src/autoload.php
-
cat << 'EOF' | tee -a src/autoload.php
/* dependencies */
require_once 'File/Iterator/Autoload.php';
@@ -253,6 +249,9 @@ exit $ret
%changelog
+* Thu Mar 30 2017 Remi Collet <remi@remirepo.net> - 6.0.11-2
+- use fedora2 autoloader template
+
* Wed Mar 29 2017 Remi Collet <remi@remirepo.net> - 6.0.11-1
- Update to 6.0.11