v2.1

3 files changed, 18 insertions, 25 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
index 4f8f8a3..aca3d6f 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
         "php": "^5.3.6 || ^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.0"
+        "phpunit/phpunit": "^4.8.35 || ^5.4.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/php-gecko-packages-gecko-php-unit.spec b/php-gecko-packages-gecko-php-unit.spec
index b510b53..c0cc844 100644
--- a/php-gecko-packages-gecko-php-unit.spec
+++ b/php-gecko-packages-gecko-php-unit.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    40a697ec261f3526e8196363b481b24383740c13
+%global gh_commit    5b9e9622c7efd3b22655270b80c03f9e52878a6e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150717
 %global gh_owner     GeckoPackages
@@ -17,7 +17,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{pk_owner}-%{pk_project}
-Version:        2.0.0
+Version:        2.1
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Additional PHPUnit tests
 
@@ -28,7 +28,6 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 %if %{with_tests}
 # For tests
@@ -85,8 +84,6 @@ EOF
 
 
 %install
-rm -rf %{buildroot}
-
 mkdir -p           %{buildroot}%{php_home}/GeckoPackages
 cp -pr src/PHPUnit %{buildroot}%{php_home}/GeckoPackages/PHPUnit
 
@@ -102,33 +99,19 @@ for unit in $(find tests -name \*Test.php -print); do
   sed -e 's:PHPUnit/tests:tests:' -i $unit
 done
 
-# remirepo:11
-run=0
 ret=0
-if which php56; then
-   php56 %{_bindir}/phpunit || ret=1
-   run=1
-fi
-if which php71; then
-   php71 %{_bindir}/phpunit || ret=1
-   run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --verbose
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit --verbose || ret=1
+  fi
+done
 exit $ret
 %else
 : Test suite disabled
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc composer.json
@@ -138,6 +121,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 28 2017 Remi Collet <remi@remirepo.net> - 2.1-1
+- Update to 2.1
+
 * Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
 - initial package, version 2.0.0