From fb29478bf99a7a8de2b2eb1861c9c7af3827a5bc Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Feb 09 2010 19:41:42 +0000 Subject: - upstream 1.2.0 - increased php-common requirements to 5.2.7 - increased php-pear requirement - use global instead of define - use channel macro in postun --- diff --git a/.cvsignore b/.cvsignore index 3e8c1ba..c84378e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -File_Iterator-1.1.1.tgz +File_Iterator-1.2.0.tgz diff --git a/php-phpunit-File-Iterator.spec b/php-phpunit-File-Iterator.spec index fdfbc1a..9dbc5f8 100644 --- a/php-phpunit-File-Iterator.spec +++ b/php-phpunit-File-Iterator.spec @@ -1,10 +1,10 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%define pear_name File_Iterator -%define channel pear.phpunit.de +%global pear_name File_Iterator +%global channel pear.phpunit.de Name: php-phpunit-File-Iterator -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: FilterIterator implementation that filters files based on a list of suffixes Group: Development/Libraries @@ -14,10 +14,10 @@ Source0: http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: php-pear >= 1:1.7.2 +BuildRequires: php-pear >= 1:1.9.0 BuildRequires: php-channel(%{channel}) Requires: php-channel(%{channel}) -Requires: php-common >= 5.1.4 +Requires: php-common >= 5.2.7 Requires(post): %{__pear} Requires(postun): %{__pear} @@ -31,9 +31,6 @@ FilterIterator implementation that filters files based on a list of suffixes. %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml %{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml -cd %{pear_name}-%{version} -%{__sed} -i -e "s@1.8.1@1.7.2@" %{name}.xml - %build cd %{pear_name}-%{version} @@ -65,7 +62,7 @@ cd %{pear_name}-%{version} %postun if [ $1 -eq 0 ] ; then %{__pear} uninstall --nodeps --ignore-errors --register-only \ - pear.phpunit.de/%{pear_name} >/dev/null || : + %{channel}/%{pear_name} >/dev/null || : fi @@ -75,6 +72,13 @@ fi %{pear_phpdir}/File %changelog +* Tue Feb 9 2010 Christof Damian - 1.2.0-1 +- upstream 1.2.0 +- increased php-common requirements to 5.2.7 +- increased php-pear requirement +- use global instead of define +- use channel macro in postun + * Thu Dec 17 2009 Christof Damian 1.1.1-2 - version 1.1.1 lowered the php requirement diff --git a/sources b/sources index 12f016f..a4d54d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b161a25641bbfde84227fd3b951742d7 File_Iterator-1.1.1.tgz +a75d831cf3c7f1df4b7526beb009b6bc File_Iterator-1.2.0.tgz