summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--php-horde-Horde-Auth.spec30
2 files changed, 16 insertions, 21 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/php-horde-Horde-Auth.spec b/php-horde-Horde-Auth.spec
index adc44ab..aab1a04 100644
--- a/php-horde-Horde-Auth.spec
+++ b/php-horde-Horde-Auth.spec
@@ -12,7 +12,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Auth
-Version: 2.2.1
+Version: 2.2.2
Release: 1%{?dist}
Summary: Horde Authentication API
@@ -21,7 +21,6 @@ License: LGPLv2
URL: http://pear.horde.org
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
BuildRequires: php(language) >= 5.3.0
BuildRequires: php-pear(PEAR) >= 1.7.0
@@ -120,25 +119,12 @@ done | tee ../%{pear_name}.lang
%check
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:)
-# remirepo:11
-run=0
ret=0
-if which php56; then
- php56 %{_bindir}/phpunit . || : ignore
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/phpunit . || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-# hex2bin is 5.4 only
-if php -r 'exit(function_exists("hex2bin") ? 0 : 1);'
-then %{_bindir}/phpunit .
-else : test ignored
-fi
-# 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
@@ -154,7 +140,6 @@ fi
%files -f %{pear_name}.lang
-%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Horde/Auth
@@ -166,6 +151,9 @@ fi
%changelog
+* Fri Jun 23 2017 Remi Collet <remi@remirepo.net> - 2.2.2-1
+- Update to 2.2.2
+
* Sun Dec 04 2016 Remi Collet <remi@fedoraproject.org> - 2.2.1-1
- Update to 2.2.1