From 63cfbcb33c5645abe0fa813d55f272a1c651b5cf Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 4 Jan 2019 12:27:34 +0100
Subject: cleanup for EL-8

---
 php-horde-Horde-Kolab-Session.spec | 38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/php-horde-Horde-Kolab-Session.spec b/php-horde-Horde-Kolab-Session.spec
index fae5f79..ac7299b 100644
--- a/php-horde-Horde-Kolab-Session.spec
+++ b/php-horde-Horde-Kolab-Session.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-horde-Horde-Kolab-Session
 #
-# Copyright (c) 2013-2017 Remi Collet
+# Copyright (c) 2013-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -12,7 +12,7 @@
 
 Name:           php-horde-Horde-Kolab-Session
 Version:        2.0.3
-Release:        2%{?dist}
+Release:        6%{?dist}
 Summary:        A package managing an active Kolab session
 
 Group:          Development/Libraries
@@ -22,7 +22,6 @@ Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
 Patch0:         %{pear_name}-upstream.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
@@ -68,7 +67,6 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf %{buildroot}
 cd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
@@ -82,30 +80,16 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 %check
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-# remirepo:15
-run=0
+
 ret=0
-if which php56; then
-   php56 %{_bindir}/phpunit . || ret=1
-   run=1
-fi
-if which php70; then
-   php70 %{_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 php70 php71 php72 php73; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit . || ret=1
+  fi
+done
 exit $ret
 
 
-%clean
-rm -rf %{buildroot}
 
 
 %post
@@ -120,15 +104,17 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Kolab/Session
 %{pear_phpdir}/Horde/Kolab/Session.php
-%{pear_testdir}/%{pear_name}
+%doc %{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Fri Jan  4 2019 Remi Collet <remi@remirepo.net> - 2.0.3-6
+- cleanup for EL-8
+
 * Wed Feb 22 2017 Remi Collet <remi@fedoraproject.org> - 2.0.3-2
 - add upstream fix for tests, fix FTBFS #1424067
 
-- 
cgit