php-horde-Horde-Text-Filter: 2.0.5

2 files changed, 7 insertions, 39 deletions

diff --git a/Horde_Text_Filter-php55.patch b/Horde_Text_Filter-php55.patch
deleted file mode 100644
index 49eefa6..0000000
--- a/Horde_Text_Filter-php55.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up lib/Horde/Text/Filter/Emails.php.old lib/Horde/Text/Filter/Emails.php
---- lib/Horde/Text/Filter/Emails.php.old	2013-01-10 15:19:06.000000000 +0100
-+++ lib/Horde/Text/Filter/Emails.php	2013-01-10 15:19:14.000000000 +0100
-@@ -124,7 +124,8 @@ EOR;
-      */
-     static public function decode($text)
-     {
--        return preg_replace('/\01\01\01([\w=+\/]*)\01\01\01/e', 'base64_decode(\'$1\')', $text);
-+        $callback = function($hex) { return base64_decode($hex[1]); };
-+        return preg_replace_callback('/\01\01\01([\w=+\/]*)\01\01\01/', $callback , $text);
-     }
- 
- }
-diff -up lib/Horde/Text/Filter/Linkurls.php.old lib/Horde/Text/Filter/Linkurls.php
---- lib/Horde/Text/Filter/Linkurls.php.old	2013-01-10 15:10:48.000000000 +0100
-+++ lib/Horde/Text/Filter/Linkurls.php	2013-01-10 15:18:31.000000000 +0100
-@@ -174,7 +174,8 @@ END_OF_REGEX;
-      */
-     static public function decode($text)
-     {
--        return preg_replace('/\00\00\00([\w=+\/]*)\00\00\00/e', 'base64_decode(\'$1\')', $text);
-+        $callback = function($hex) { return base64_decode($hex[1]); };
-+        return preg_replace_callback('/\00\00\00([\w=+\/]*)\00\00\00/', $callback, $text);
-     }
- 
- }
diff --git a/php-horde-Horde-Text-Filter.spec b/php-horde-Horde-Text-Filter.spec
index a1f6ff1..d1255ca 100644
--- a/php-horde-Horde-Text-Filter.spec
+++ b/php-horde-Horde-Text-Filter.spec
@@ -4,8 +4,8 @@
 %global pear_channel pear.horde.org
 
 Name:           php-horde-Horde-Text-Filter
-Version:        2.0.4
-Release:        3%{?dist}
+Version:        2.0.5
+Release:        1%{?dist}
 Summary:        Horde Text Filter API
 
 Group:          Development/Libraries
@@ -13,12 +13,10 @@ License:        LGPLv2+
 URL:            http://pear.horde.org
 # remove non-free stuff
 # http://bugs.horde.org/ticket/11870
-# pear download Horde_Text_Filter
+# pear download horde/Horde_Text_Filter
 # ./strip.sh %{version}
 Source0:        %{pear_name}-%{version}-strip.tgz
 Source1:        strip.sh
-# http://bugs.horde.org/ticket/11943
-Patch0:         %{pear_name}-php55.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
@@ -58,15 +56,11 @@ Common methods for fitering and converting text.
 %setup -q -c
 cd %{pear_name}-%{version}
 
-%patch0 -p0 -b .php55
-
 # 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 '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
-    -e '/Emails.php/s/md5sum=.*name=/name=/' \
-    -e '/Linkurls.php/s/md5sum=.*name=/name=/' \
     ../package.xml >%{name}.xml
 
 
@@ -105,14 +99,11 @@ done | tee ../%{pear_name}.lang
 src=$(pwd)/%{pear_name}-%{version}
 cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
 
-# Skip this one for now - need investigation
-sed -e 's/testHtml2TextSpacing/SKIP_testHtml2TextSpacing/' \
-    -i Html2textTest.php
 # Skip this one for now - need investigation (failed only in mock)
 sed -e 's/testXss/SKIP_testXss/' \
     -i XssTest.php
 
-# Can't work as we drop this now free stuff
+# Can't work as we drop this non free stuff
 rm -f JsminTest.php
 
 phpunit \
@@ -148,6 +139,9 @@ fi
 
 
 %changelog
+* Tue Feb 12 2013 Remi Collet <remi@fedoraproject.org> - 2.0.5-1
+- Update to 2.0.5
+
 * Wed Feb  6 2013 Remi Collet <remi@fedoraproject.org> - 2.0.4-3
 - cleanups for review
 - always run tests but skip 2 for now