summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore7
-rw-r--r--php-horde-Horde-Imap-Client.spec34
2 files changed, 20 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-Imap-Client.spec b/php-horde-Horde-Imap-Client.spec
index 5ae0aba..9cf1285 100644
--- a/php-horde-Horde-Imap-Client.spec
+++ b/php-horde-Horde-Imap-Client.spec
@@ -12,7 +12,7 @@
%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
Name: php-horde-Horde-Imap-Client
-Version: 2.29.12
+Version: 2.29.13
Release: 1%{?dist}
Summary: Horde IMAP abstraction interface
@@ -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
@@ -139,25 +138,16 @@ done | tee ../%{pear_name}.lang
export LANG=fr_FR.utf8
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-# 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
-if %{_bindir}/phpunit --atleast-version 4.8; then
- %{_bindir}/phpunit --verbose .
-else
- : PHPUnit is too old for this package
-fi
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+ if which $cmd; then
+ if %{_bindir}/phpunit --atleast-version 4.8; then
+ $cmd %{_bindir}/phpunit --verbose .
+ else
+ : PHPUnit is too old for this package
+ fi
+ fi
+done
exit $ret
%else
: bootstrap build with test suite disabled
@@ -176,7 +166,6 @@ fi
%files -f %{pear_name}.lang
-%defattr(-,root,root,-)
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%dir %{pear_phpdir}/Horde/Imap
@@ -189,6 +178,9 @@ fi
%changelog
+* Fri Jun 23 2017 Remi Collet <remi@remirepo.net> - 2.29.13-1
+- Update to 2.29.13
+
* Tue Dec 20 2016 Remi Collet <remi@fedoraproject.org> - 2.29.12-1
- Update to 2.29.12