From b403e91aa374d9b7f72e06feabcf35a8fb53e8e4 Mon Sep 17 00:00:00 2001
From: Christof Damian <christof@damian.net>
Date: Apr 20 2013 17:02:14 +0000
Subject: remove more mentions of non-free stuff


---

diff --git a/php-pear-phing.spec b/php-pear-phing.spec
index 4c4a52f..f2336d4 100644
--- a/php-pear-phing.spec
+++ b/php-pear-phing.spec
@@ -6,7 +6,7 @@
 Summary:	A project build system based on Apache Ant
 Name:		php-pear-phing
 Version:	2.5.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	LGPLv2
 Group:		Development/Tools
@@ -95,6 +95,9 @@ fi
 
 
 %changelog
+* Sat Apr 20 2013 Christof Damian <christof@damian.net> - 2.5.0-2
+- remove more mentions of non-free stuff
+
 * Sat Apr 20 2013 Christof Damian <christof@damian.net> - 2.5.0-1
 - upstream 2.5.0
 - remove non-free stuff from defaults.properties (Remi Collet <fedora@famillecollet.com>)
diff --git a/sources b/sources
index e748489..f4f1215 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e54960ff49840cd0a3d2043ace9f891  phing-2.5.0-strip.tgz
+41ba6591d19479e7f1594f196b2fbff8  phing-2.5.0-strip.tgz
diff --git a/strip.sh b/strip.sh
index 41571a0..55f1cf7 100755
--- a/strip.sh
+++ b/strip.sh
@@ -10,11 +10,15 @@ if [ -f $name-$1.tgz ]; then
 	rm -r $name-$1/tasks/ext/jsmin
 
 	sed -e '/^jsmin=/d' \
-		-i $name-$1/tasks/defaults.properties
+	    -i $name-$1/tasks/defaults.properties
+
+	sed -En -e '/<ref name="jsmin"\/>/d; /<define name="jsmin">/,/<\/define>/d; 1h;1!H;${;g;s/<!--(\s|=)+JsMinTask(\s|=)+-->//;p;};' \
+	    -i $name-$1/etc/phing-grammar.rng
 
 	sed -e '/tasks\/ext\/jsmin/d' \
-		-e '/defaults.properties/s/md5sum.*name/name/' \
-		-i package.xml
+	    -e '/defaults.properties/s/md5sum.*name/name/' \
+	    -e '/phing-grammar.rng/s/md5sum.*name/name/' \
+	    -i package.xml
 
 	tar czf $name-$1-strip.tgz package.xml $name-$1
 	tar tf $name-$1-strip.tgz | grep -v '/$' | sort >$list.new