From 1f7b325bb9605700fbb0b71db245c3ba6ed03dce Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Jul 22 2010 17:18:05 +0000 Subject: fix php-pear requirement --- diff --git a/php-phpunit-File-Iterator.spec b/php-phpunit-File-Iterator.spec index 2d0d960..bc8c961 100644 --- a/php-phpunit-File-Iterator.spec +++ b/php-phpunit-File-Iterator.spec @@ -4,7 +4,7 @@ Name: php-phpunit-File-Iterator Version: 1.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FilterIterator implementation that filters files based on a list of suffixes Group: Development/Libraries @@ -14,8 +14,7 @@ Source0: http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# package.xml states 1.9.1, but does not use it -BuildRequires: php-pear >= 1:1.9.0 +BuildRequires: php-pear >= 1:1.9.0 BuildRequires: php-channel(%{channel}) Requires: php-channel(%{channel}) Requires: php-common >= 5.2.7 @@ -30,8 +29,11 @@ FilterIterator implementation that filters files based on a list of suffixes. %prep %setup -q -c -[ -f package2.xml ] || mv package.xml package2.xml +[ -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.9.1@1.9.0@" %{name}.xml + %build cd %{pear_name}-%{version} @@ -40,7 +42,8 @@ cd %{pear_name}-%{version} %install cd %{pear_name}-%{version} -%{__rm} -rf $RPM_BUILD_ROOT docdir +%{__rm} -rf $RPM_BUILD_ROOT docdir# package.xml states 1.9.1, but does not use it + %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml # Clean up unnecessary files @@ -73,6 +76,9 @@ fi %{pear_phpdir}/File %changelog +* Thu Jul 22 2010 Christof Damian - 1.2.2-2 +- fix minimum pear requirement + * Thu Jul 22 2010 Christof Damian - 1.2.2-1 - upstream 1.2.2, bugfix