From 6bd6bdd7a061edd2bca41511fdbf5335fb1fe04a Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Thu, 28 Mar 2013 13:35:15 +0100
Subject: php-pear-phing: remove jsmin from task/defaults.properties

---
 php-pear-phing.spec | 5 ++++-
 strip.sh            | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/php-pear-phing.spec b/php-pear-phing.spec
index 207f0b7..29c6bc1 100644
--- a/php-pear-phing.spec
+++ b/php-pear-phing.spec
@@ -5,7 +5,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
@@ -108,6 +108,9 @@ fi
 
 
 %changelog
+* Thu Mar 28 2013 Remi Collet <remi@fedoraproject.org> - 2.5.0-2
+- remove jsmin from task/defaults.properties
+
 * Wed Mar 13 2013 Remi Collet <remi@fedoraproject.org> - 2.5.0-1
 - Update to 2.5.0
 
diff --git a/strip.sh b/strip.sh
index e376009..41571a0 100755
--- a/strip.sh
+++ b/strip.sh
@@ -8,7 +8,13 @@ if [ -f $name-$1.tgz ]; then
 	tar tf $name-$1.tgz | sort >$list.old
 
 	rm -r $name-$1/tasks/ext/jsmin
-	sed -e '/tasks\/ext\/jsmin/d' -i package.xml
+
+	sed -e '/^jsmin=/d' \
+		-i $name-$1/tasks/defaults.properties
+
+	sed -e '/tasks\/ext\/jsmin/d' \
+		-e '/defaults.properties/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
-- 
cgit