diff options
author | Remi Collet <fedora@famillecollet.com> | 2013-11-20 09:58:13 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2013-11-20 09:58:13 +0100 |
commit | 77795abdb008c278b679cce7fe9afbb0282be26c (patch) | |
tree | e6f3815b85085b1420350bece776738c28e824b7 | |
parent | 8d3ca7d5e8be43e6fc651a3ae7959c53aec1de87 (diff) |
php-horde-Horde-Text-Filter: 2.2.0
-rw-r--r-- | php-horde-Horde-Text-Filter.spec | 26 | ||||
-rwxr-xr-x | strip.sh | 25 |
2 files changed, 15 insertions, 36 deletions
diff --git a/php-horde-Horde-Text-Filter.spec b/php-horde-Horde-Text-Filter.spec index b6fa187..2c643cb 100644 --- a/php-horde-Horde-Text-Filter.spec +++ b/php-horde-Horde-Text-Filter.spec @@ -3,19 +3,14 @@ %global pear_channel pear.horde.org Name: php-horde-Horde-Text-Filter -Version: 2.1.5 +Version: 2.2.0 Release: 1%{?dist} Summary: Horde Text Filter API Group: Development/Libraries License: LGPLv2 -URL: http://pear.horde.org -# remove non-free stuff -# http://bugs.horde.org/ticket/11870 -# pear download horde/Horde_Text_Filter -# ./strip.sh %{version} -Source0: %{pear_name}-%{version}-strip.tgz -Source1: strip.sh +URL: http://%{pear_channel}/ +Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -29,10 +24,8 @@ BuildRequires: php-pear(%{pear_channel}/Horde_Text_Flowed) >= 2.0.0 Requires(post): %{__pear} Requires(postun): %{__pear} +# From package.xml Requires: php(language) >= 5.3.0 -Requires: php-pcre -Requires: php-spl -Requires: php-tidy Requires: php-pear(PEAR) >= 1.7.0 Requires: php-channel(%{pear_channel}) Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 @@ -40,9 +33,14 @@ Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0 # Optional +Requires: php-tidy Requires: php-pear(%{pear_channel}/Horde_Text_Flowed) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Text_Flowed) < 3.0.0 +# From phpcompatinfo report for 2.2.0 +Requires: php-dom +Requires: php-pcre # Optional and implicitly required: Horde_Translation +# Optional but non-free: Horde_Text_Filter_Jsmin Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} @@ -140,6 +138,12 @@ fi %changelog +* Wed Nov 20 2013 Remi Collet <remi@fedoraproject.org> - 2.2.0-1 +- Update to 2.2.0 +- upstream have move JSMin non-free code to a separate package +- add dependency on php-dom + + * Thu Oct 24 2013 Remi Collet <remi@fedoraproject.org> - 2.1.5-1 - Update to 2.1.5 diff --git a/strip.sh b/strip.sh deleted file mode 100755 index 4ec9788..0000000 --- a/strip.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -name=Horde_Text_Filter -list=$(mktemp) - -if [ -f $name-$1.tgz ] -then - tar xif $name-$1.tgz - tar tf $name-$1.tgz >$list.old - - rm $name-$1/lib/Horde/Text/Filter/JavascriptMinify/JsMin.php - 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 - - colordiff -u $list.old $list.new - rm -rf $name-$1 package.xml -else - echo "usage $0 <version>" -fi -rm -f $list* |