From a22a90dff1f78e4c48d126e0ef041653c025fcd5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 3 May 2017 13:49:48 +0200
Subject: v2.2.0

---
 php-horde-Horde-Compress.spec | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'php-horde-Horde-Compress.spec')

diff --git a/php-horde-Horde-Compress.spec b/php-horde-Horde-Compress.spec
index 7781b40..8d299f3 100644
--- a/php-horde-Horde-Compress.spec
+++ b/php-horde-Horde-Compress.spec
@@ -12,7 +12,7 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Compress
-Version:        2.1.6
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        Horde Compression API
 
@@ -21,7 +21,9 @@ License:        LGPLv2
 URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+# https://github.com/horde/horde/pull/219
+Patch0:         %{name}-pr219.patch
+
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.7.0
 BuildRequires:  php-channel(%{pear_channel})
@@ -29,6 +31,11 @@ BuildRequires:  gettext
 # To run unit tests
 BuildRequires:  php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
 BuildRequires:  php-pear(%{pear_channel}/Horde_Stream_Filter) >= 2.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Mime) >= 2.5.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Icalendar) >= 2.0.0
+BuildRequires:  php-pear(%{pear_channel}/Horde_Mapi) >= 1.0.0
+# avoid Math_Biginteger native implementation
+BuildRequires:  php-gmp
 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
@@ -66,11 +73,13 @@ An API for various compression techniques.
 %prep
 %setup -q -c
 cd %{pear_name}-%{version}
+%patch0 -p3 -b .pr219
 
 # Don't install .po and .pot files
 # Remove checksum for .mo, as we regenerate them
 sed -e '/%{pear_name}.po/d' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
+    -e '/role="test"/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 touch -r ../package.xml %{name}.xml
 
@@ -106,21 +115,12 @@ done | tee ../%{pear_name}.lang
 %check
 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
 
 
@@ -135,7 +135,6 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %files -f %{pear_name}.lang
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Horde/Compress
@@ -146,6 +145,10 @@ fi
 
 
 %changelog
+* Wed May  3 2017 Remi Collet <remi@remirepo.net> - 2.2.0-1
+- Update to 2.2.0
+- open https://github.com/horde/horde/pull/219 - fix tests
+
 * Tue Dec 20 2016 Remi Collet <remi@fedoraproject.org> - 2.1.6-1
 - Update to 2.1.6
 
-- 
cgit