diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-05-01 18:13:29 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-05-01 18:13:29 +0200 |
| commit | e80b804c772c8ddb63cfbb2694d17e8956a01872 (patch) | |
| tree | 2571e5b63eb629fe05fdcf387e8cd5af8622ebf9 | |
| parent | 6bd6bdd7a061edd2bca41511fdbf5335fb1fe04a (diff) | |
php-pear-phing: clean more non-free stuf
| -rw-r--r-- | php-pear-phing.spec | 14 | ||||
| -rwxr-xr-x | strip.sh | 10 |
2 files changed, 18 insertions, 6 deletions
diff --git a/php-pear-phing.spec b/php-pear-phing.spec index 29c6bc1..bbe1a1c 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: 2%{?dist} +Release: 3%{?dist} License: LGPLv2 Group: Development/Tools @@ -15,10 +15,12 @@ Group: Development/Tools # ./strip.sh %{version} Source0: %{pear_name}-%{version}-strip.tgz Source1: strip.sh + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://phing.info/trac/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch +BuildArch: noarch + BuildRequires: php(language) >= 5.2.0 BuildRequires: php-pear(PEAR) >= 1.8.0 BuildRequires: php-channel(%{pear_channel}) @@ -108,6 +110,12 @@ fi %changelog +* Wed May 1 2013 Remi Collet <remi@fedoraproject.org> - 2.5.0-3 +- clean more non-free stuff + +* Sat Apr 20 2013 Christof Damian <christof@damian.net> - 2.5.0-2 +- remove more mentions of non-free stuff + * Thu Mar 28 2013 Remi Collet <remi@fedoraproject.org> - 2.5.0-2 - remove jsmin from task/defaults.properties @@ -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 |