From f1e36bb1da02c6b2bb07700ea3ab8d7786b71f4d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 31 Dec 2018 07:24:49 +0100
Subject: update to 2.3.6 drop patch merged upstream

---
 php-horde-Horde-Text-Filter.spec | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'php-horde-Horde-Text-Filter.spec')

diff --git a/php-horde-Horde-Text-Filter.spec b/php-horde-Horde-Text-Filter.spec
index 3fca19f..26f365e 100644
--- a/php-horde-Horde-Text-Filter.spec
+++ b/php-horde-Horde-Text-Filter.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-horde-Horde-Text-Filter
 #
-# Copyright (c) 2012-2017 Nick Bebout, Remi Collet
+# Copyright (c) 2012-2018 Nick Bebout, Remi Collet
 #
 # License: MIT
 # https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
@@ -12,8 +12,8 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Text-Filter
-Version:        2.3.5
-Release:        6%{?dist}
+Version:        2.3.6
+Release:        1%{?dist}
 Summary:        Horde Text Filter API
 
 Group:          Development/Libraries
@@ -21,9 +21,6 @@ License:        LGPLv2
 URL:            http://%{pear_channel}/
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
-# from https://github.com/horde/Text_Filter/pull/1
-Patch0:         https://github.com/horde/Text_Filter/commit/4345913413bf411db8f4a758221e865c5fd6e4bd.patch
-
 BuildArch:      noarch
 BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-pear(PEAR) >= 1.7.0
@@ -66,14 +63,11 @@ Common methods for fitering and converting text.
 %prep
 %setup -q -c
 cd %{pear_name}-%{version}
-%patch0 -p1
 
 # Don't install .po and .pot files
 # Remove checksum for .mo, as we regenerate them
 sed -e '/%{pear_name}.po/d' \
     -e '/Horde_Other.po/d' \
-    -e '/Emails.php/s/md5sum=.*name=/name=/' \
-    -e '/Linkurls.php/s/md5sum=.*name=/name=/' \
     -e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 touch -r ../package.xml %{name}.xml
@@ -124,7 +118,7 @@ sed -e 's/testMsoNormalCss/SKIP_testMsoNormalCss/' \
 ret=0
 for cmd in php php56 php70 php71 php72 php73; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit --verbose . || ret=1
+    $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1
   fi
 done
 exit $ret
@@ -154,6 +148,10 @@ fi
 
 
 %changelog
+* Mon Dec 31 2018 Remi Collet <remi@remirepo.net> - 2.3.6-1
+- update to 2.3.6
+- drop patch merged upstream
+
 * Mon Oct 15 2018 Remi Collet <remi@fedoraproject.org> - 2.3.5-6
 - add patch for PHP 7.3 from https://github.com/horde/Text_Filter/pull/1
 
-- 
cgit