diff options
author | Remi Collet <fedora@famillecollet.com> | 2013-01-15 11:35:23 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2013-01-15 11:35:23 +0100 |
commit | 12026498f22940cfe7fe022f220f7f767ea76878 (patch) | |
tree | 978a27550578d35cda16edeab3d7be9f9f51ac49 | |
parent | efafd01202272ae79fdf5487ea1173e1297d8df6 (diff) |
php-pear-phing: drop non-free stuff
-rw-r--r-- | php-pear-phing.spec | 21 | ||||
-rwxr-xr-x | strip.sh | 21 |
2 files changed, 37 insertions, 5 deletions
diff --git a/php-pear-phing.spec b/php-pear-phing.spec index 78d8f51..db77c71 100644 --- a/php-pear-phing.spec +++ b/php-pear-phing.spec @@ -5,11 +5,16 @@ Summary: A project build system based on Apache Ant Name: php-pear-phing Version: 2.4.14 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPLv2 Group: Development/Tools -Source0: http://%{pear_channel}/get/phing-%{version}.tgz + +# remove non-free stuff +# pear download phing/phing +# ./strip.sh %{version} +Source0: %{pear_name}-%{version}-strip.tgz +Source1: strip.sh URL: http://phing.info/trac/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -21,7 +26,6 @@ BuildRequires: dos2unix Requires: php(language) >= 5.2.0 Requires: php-cli Requires: php-pear(PEAR) >= 1.8.0 -Requires: php-pecl-xdebug >= 2.0.5 Requires: php-channel(%{pear_channel}) # Optional @@ -75,8 +79,6 @@ cd %{pear_name}-%{version} cd %{pear_name}-%{version} %{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml -# not in the archive dos2unix %{buildroot}/%{pear_docdir}/%{pear_name}/UPGRADE - rm -rf %{buildroot}%{pear_metadir}/.??* mkdir -p %{buildroot}%{pear_xmldir} @@ -105,6 +107,15 @@ fi %changelog +* Tue Jan 15 2013 Collet <RPMS@FamilleCollet.com> - 2.4.14-1.1 +- sync with rawhide, drop free stuff + +* Mon Jan 14 2013 Christof Damian <christof@damian.net> - 2.4.14-1 +- upstream 2.4.14 +- remove non-free stuff +- remove optional xdebug requirement +- use pear_metadir + * Fri Nov 30 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.4.14-1 - upstream 2.4.14, for remi repo diff --git a/strip.sh b/strip.sh new file mode 100755 index 0000000..e376009 --- /dev/null +++ b/strip.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +name=phing +list=$(mktemp) + +if [ -f $name-$1.tgz ]; then + tar xif $name-$1.tgz + tar tf $name-$1.tgz | sort >$list.old + + rm -r $name-$1/tasks/ext/jsmin + sed -e '/tasks\/ext\/jsmin/d' -i package.xml + + tar czf $name-$1-strip.tgz package.xml $name-$1 + tar tf $name-$1-strip.tgz | grep -v '/$' | sort >$list.new + + diff -u $list.old $list.new + rm -rf $name-$1 package.xml +else + echo "usage $0 <version>" +fi +rm -f $list* |