v2.2.2HEADmaster

1 files changed, 10 insertions, 21 deletions

diff --git a/php-horde-Horde-Mime-Viewer.spec b/php-horde-Horde-Mime-Viewer.spec
index 89381eb..ec93a73 100644
--- a/php-horde-Horde-Mime-Viewer.spec
+++ b/php-horde-Horde-Mime-Viewer.spec
@@ -15,7 +15,7 @@
 %global with_tests   0%{?_with_tests:1}
 
 Name:           php-horde-Horde-Mime-Viewer
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 Summary:        Horde MIME Viewer Library
 
@@ -24,7 +24,6 @@ License:        LGPLv2
 URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
@@ -107,7 +106,6 @@ done
 
 
 %install
-rm -rf %{buildroot}
 cd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
@@ -126,29 +124,18 @@ do
 done | tee ../%{pear_name}.lang
 
 
-%clean
-rm -rf %{buildroot}
 
 
 %check
 %if %{with_tests}
 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
-%{_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 disabled, missing '--with tests' option.
@@ -167,12 +154,11 @@ fi
 
 
 %files -f %{pear_name}.lang
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Mime/Viewer
 %{pear_phpdir}/Horde/Mime/Viewer.php
-%{pear_testdir}/%{pear_name}
+%doc %{pear_testdir}/%{pear_name}
 %dir %{pear_datadir}/%{pear_name}
 %dir %{pear_datadir}/%{pear_name}/locale
 %if ! %{with_sysjs}
@@ -181,6 +167,9 @@ fi
 
 
 %changelog
+* Mon Aug 28 2017 Remi Collet <remi@remirepo.net> - 2.2.2-1
+- Update to 2.2.2
+
 * Wed Sep 07 2016 Remi Collet <remi@fedoraproject.org> - 2.2.1-1
 - Update to 2.2.1