summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-08-01 16:48:11 +0200
committerRemi Collet <remi@remirepo.net>2017-08-01 16:48:11 +0200
commit580fb351360062b1e1ce0be9bcf8506fbb057de6 (patch)
tree5eb0c1a018fc7fd66d7a9688e2b2f5fcc6e420a6
parentcba37f13377bead17d278d813789d78d72b3df1d (diff)
-rw-r--r--.gitignore7
-rw-r--r--php-horde-Horde-Url.spec21
2 files changed, 19 insertions, 9 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-Url.spec b/php-horde-Horde-Url.spec
index d30a89e..71941d1 100644
--- a/php-horde-Horde-Url.spec
+++ b/php-horde-Horde-Url.spec
@@ -18,7 +18,7 @@
%endif
Name: php-horde-Horde-Url
-Version: 2.2.5
+Version: 2.2.6
Release: 1%{?dist}
Summary: Horde Url class
@@ -27,7 +27,6 @@ License: LGPLv2
URL: http://%{pear_channel}
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
@@ -80,11 +79,13 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
%check
%if %{with_tests}
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-%{_bindir}/phpunit .
-
-if which php70; then
- php70 %{_bindir}/phpunit .
-fi
+ret=0
+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 disabled, missing '--with tests' option.
%endif
@@ -101,15 +102,17 @@ if [ $1 -eq 0 ] ; then
fi
%files
-%defattr(-,root,root,-)
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Horde/Url
%{pear_phpdir}/Horde/Url.php
-%{pear_testdir}/Horde_Url
+%doc %{pear_testdir}/Horde_Url
%doc %{pear_docdir}/Horde_Url
%changelog
+* Tue Aug 1 2017 Remi Collet <remi@remirepo.net> - 2.2.6-1
+- Update to 2.2.6
+
* Tue Feb 02 2016 Remi Collet <remi@fedoraproject.org> - 2.2.5-1
- Update to 2.2.5
- PHP 7 compatible version