From 956e2e9294f466b2a7fa2e795e75cf8bf2042a81 Mon Sep 17 00:00:00 2001 From: remi Date: Jan 17 2012 16:28:22 +0000 Subject: update to 1.3.1 --- diff --git a/.gitignore b/.gitignore index 92f13fe..3cf9941 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ File_Iterator-1.2.2.tgz /File_Iterator-1.2.4.tgz /File_Iterator-1.2.6.tgz /File_Iterator-1.3.0.tgz +/php-phpunit-File-Iterator.spec +/File_Iterator-1.3.1.tgz diff --git a/php-phpunit-File-Iterator.spec b/php-phpunit-File-Iterator.spec index 351cf28..405edad 100644 --- a/php-phpunit-File-Iterator.spec +++ b/php-phpunit-File-Iterator.spec @@ -3,8 +3,8 @@ %global channel pear.phpunit.de Name: php-phpunit-File-Iterator -Version: 1.3.0 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: FilterIterator implementation that filters files based on a list of suffixes Group: Development/Libraries @@ -30,9 +30,8 @@ FilterIterator implementation that filters files based on a list of suffixes. %prep %setup -q -c [ -f package2.xml ] || %{__mv} package.xml package2.xml -%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml +mv package2.xml %{pear_name}-%{version}/%{name}.xml cd %{pear_name}-%{version} -%{__sed} -i -e "s@1.9.2@1.9.0@" %{name}.xml %build @@ -41,21 +40,21 @@ cd %{pear_name}-%{version} %install +rm -rf %{buildroot} cd %{pear_name}-%{version} -%{__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 +%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml # Clean up unnecessary files -%{__rm} -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* +rm -rf %{buildroot}%{pear_phpdir}/.??* # Install XML package description -%{__mkdir} -p $RPM_BUILD_ROOT%{pear_xmldir} -%{__install} -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir} +mkdir -p %{buildroot}%{pear_xmldir} +install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir} %clean -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post @@ -78,6 +77,11 @@ fi %doc %{pear_docdir}/%{pear_name} %changelog +* Tue Jan 17 2012 Remi Collet - 1.3.1-1 +- Version 1.3.1 (stable) - API 1.3.0 (stable) +- unmacro current command +- remove pear version hack + * Sat Jan 14 2012 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index dd7eb49..e06319c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -198f99b9f0b4a28b2f32e9478cc24fce File_Iterator-1.3.0.tgz +b49f87caff9b13bf528061cae5905e19 File_Iterator-1.3.1.tgz