From 73ad1dd808ab3005c15392ca447d513c2f46e6df Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 3 Jul 2016 14:35:51 +0200
Subject: php-horde-Horde-Db: 2.3.2

---
 0003-drop-ereg-dep-for-php-7-in-Db.patch | 25 -------------------------
 php-horde-Horde-Db.spec                  | 32 +++++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 36 deletions(-)
 delete mode 100644 0003-drop-ereg-dep-for-php-7-in-Db.patch

diff --git a/0003-drop-ereg-dep-for-php-7-in-Db.patch b/0003-drop-ereg-dep-for-php-7-in-Db.patch
deleted file mode 100644
index 81fa02b..0000000
--- a/0003-drop-ereg-dep-for-php-7-in-Db.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 70efe638bfe64a09f97758223862efd81d30f301 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Mon, 27 Jun 2016 07:45:45 +0200
-Subject: [PATCH 3/3] drop ereg dep for php 7 in Db
-
----
- framework/Db/lib/Horde/Db/SearchParser.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/framework/Db/lib/Horde/Db/SearchParser.php b/framework/Db/lib/Horde/Db/SearchParser.php
-index fcb5181..d08d1e6 100644
---- a/framework/Db/lib/Horde/Db/SearchParser.php
-+++ b/framework/Db/lib/Horde/Db/SearchParser.php
-@@ -156,7 +156,7 @@ class Horde_Db_SearchParser
-         }
- 
-         $val = Horde_String::lower(substr(array_shift($tokens), 1));
--        $val = addslashes(ereg_replace("([\\%])", "\\\\1", $val));
-+        $val = addslashes(str_replace("%", "\\%", $val));
- 
-         return "(LOWER($column) LIKE '%$val%')";
-     }
--- 
-2.5.5
-
diff --git a/php-horde-Horde-Db.spec b/php-horde-Horde-Db.spec
index 3df068c..b38a827 100644
--- a/php-horde-Horde-Db.spec
+++ b/php-horde-Horde-Db.spec
@@ -12,8 +12,8 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Db
-Version:        2.3.1
-Release:        2%{?dist}
+Version:        2.3.2
+Release:        1%{?dist}
 Summary:        Horde Database Libraries
 
 Group:          Development/Libraries
@@ -21,9 +21,6 @@ License:        BSD
 URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-# https://github.com/horde/horde/pull/195
-Patch0:         0003-drop-ereg-dep-for-php-7-in-Db.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
@@ -69,9 +66,6 @@ Horde database/SQL abstraction layer
 
 cd %{pear_name}-%{version}
 mv ../package.xml %{name}.xml
-%patch0 -p3 -b .ereg
-sed -e '/SearchParser.php/s/md5sum="[^"]*"//' \
-    -i %{name}.xml
 
 
 %build
@@ -93,11 +87,23 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 %check
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-%{_bindir}/phpunit .
 
-if which php70; then
-   php70 %{_bindir}/phpunit .
+# 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
+exit $ret
 
 
 %post
@@ -122,6 +128,10 @@ fi
 
 
 %changelog
+* Sun Jul 03 2016 Remi Collet <remi@fedoraproject.org> - 2.3.2-1
+- Update to 2.3.2
+- drop patch merged upstream
+
 * Mon Jun 27 2016 Remi Collet <remi@fedoraproject.org> - 2.3.1-2
 - add patch to drop dependency on ereg
 
-- 
cgit