[php-horde-Horde-Text-Filter] 2.1.4

Remi Collet remi at fedoraproject.org
Thu Oct 10 07:13:49 UTC 2013


commit c2f3878a5d0b96bcdeef74929ccd42b8af50e66f
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Oct 10 09:13:38 2013 +0200

    2.1.4

 .gitignore                       |    1 +
 php-horde-Horde-Text-Filter.spec |   10 +++++-----
 sources                          |    2 +-
 strip.sh                         |    7 +++++--
 4 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eef4710..4baad9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /Horde_Text_Filter-2.1.2.tgz
 /Horde_Text_Filter-2.1.2-strip.tgz
 /Horde_Text_Filter-2.1.3-strip.tgz
+/Horde_Text_Filter-2.1.4-strip.tgz
diff --git a/php-horde-Horde-Text-Filter.spec b/php-horde-Horde-Text-Filter.spec
index b9c96ac..6def5d4 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.1.3
-Release:        2%{?dist}
+Version:        2.1.4
+Release:        1%{?dist}
 Summary:        Horde Text Filter API
 
 Group:          Development/Libraries
@@ -107,9 +107,6 @@ sed -e 's/testBug9567/SKIP_testBug9567/' \
 sed -e 's/testXss/SKIP_testXss/' \
     -i XssTest.php
 
-# Can't work as we drop this non free stuff
-rm -f JsminTest.php
-
 phpunit \
     -d include_path=$src/lib:.:%{pear_phpdir} \
     -d date.timezone=UTC \
@@ -142,6 +139,9 @@ fi
 
 
 %changelog
+* Thu Oct 10 2013 Remi Collet <remi at fedoraproject.org> - 2.1.4-1
+- Update to 2.1.4
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 60fecfd..e97a6f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e9bb6c01f4f09c717f5ec26b46ab7e8  Horde_Text_Filter-2.1.3-strip.tgz
+6579a0081eb75a19228831d007649b77  Horde_Text_Filter-2.1.4-strip.tgz
diff --git a/strip.sh b/strip.sh
index 1d69b18..4ec9788 100755
--- a/strip.sh
+++ b/strip.sh
@@ -9,12 +9,15 @@ then
 	tar tf $name-$1.tgz >$list.old
 
 	rm $name-$1/lib/Horde/Text/Filter/JavascriptMinify/JsMin.php
-	sed -e '/JsMin.php/d' -i package.xml
+	rm $name-$1/test/Horde/Text/Filter/JsminTest.php
+	sed -e '/JsMin.php/d' \
+	    -e '/JsminTest.php/d' \
+	    -i package.xml
 
 	tar czf $name-$1-strip.tgz package.xml $name-$1
 	tar tf $name-$1-strip.tgz | grep -v '/$' >$list.new
 
-	diff $list.old $list.new
+	colordiff -u $list.old $list.new
 	rm -rf $name-$1 package.xml
 else
 	echo "usage $0 <version>"


More information about the scm-commits mailing list