From 06de9d9ed6d411ffea067d4e5748672ab3039d51 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Jun 02 2016 04:17:16 +0000
Subject: 2.29.7


(cherry picked from commit e478cedfad20c8b61c05e5c8ff9f76da7abfdb95)

---

diff --git a/.gitignore b/.gitignore
index bc43fcd..395d357 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ clog
 /Horde_Imap_Client-2.29.4.tgz
 /Horde_Imap_Client-2.29.5.tgz
 /Horde_Imap_Client-2.29.6.tgz
+/Horde_Imap_Client-2.29.7.tgz
diff --git a/php-horde-Horde-Imap-Client.spec b/php-horde-Horde-Imap-Client.spec
index 53fb05b..054adf8 100644
--- a/php-horde-Horde-Imap-Client.spec
+++ b/php-horde-Horde-Imap-Client.spec
@@ -6,14 +6,13 @@
 #
 # Please, preserve the changelog entries
 #
-%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear:       %global __pear       %{_bindir}/pear}
 %global pear_name    Horde_Imap_Client
 %global pear_channel pear.horde.org
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 
 Name:           php-horde-Horde-Imap-Client
-Version:        2.29.6
+Version:        2.29.7
 Release:        1%{?dist}
 Summary:        Horde IMAP abstraction interface
 
@@ -138,12 +137,12 @@ done | tee ../%{pear_name}.lang
 %if %{with_tests}
 export LANG=fr_FR.utf8
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-%if 0%{?fedora} < 21 && 0%{?rhel} < 7
-# ignore test results with old PHPUnit
-%{_bindir}/phpunit --verbose .
-%else
-%{_bindir}/phpunit --verbose .
-%endif
+
+if %{_bindir}/phpunit --atleast-version 4.8; then
+   %{_bindir}/phpunit --verbose .
+else
+   : PHPUnit is too old for this package
+fi
 
 if which php70; then
    php70 %{_bindir}/phpunit --verbose .
@@ -177,6 +176,9 @@ fi
 
 
 %changelog
+* Thu Jun 02 2016 Remi Collet <remi@fedoraproject.org> - 2.29.7-1
+- Update to 2.29.7
+
 * Mon Mar 21 2016 Remi Collet <remi@fedoraproject.org> - 2.29.6-1
 - Update to 2.29.6
 
diff --git a/sources b/sources
index fb84140..d1b3a57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c23e5b11e217c7817b441e89708856da  Horde_Imap_Client-2.29.6.tgz
+2de0efa821c97e6a9247a216763b4550  Horde_Imap_Client-2.29.7.tgz