php-phpunit-PHP-TokenStream: 1.1.7

1 files changed, 20 insertions, 13 deletions

diff --git a/php-phpunit-PHP-TokenStream.spec b/php-phpunit-PHP-TokenStream.spec
index 280343b..169ce6a 100644
--- a/php-phpunit-PHP-TokenStream.spec
+++ b/php-phpunit-PHP-TokenStream.spec
@@ -1,10 +1,9 @@
-%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name     PHP_TokenStream
 %global channel       pear.phpunit.de
 
 Name:           php-phpunit-PHP-TokenStream
-Version:        1.1.5
+Version:        1.1.7
 Release:        1%{?dist}
 Summary:        Wrapper around PHP tokenizer extension
 
@@ -12,15 +11,19 @@ Group:          Development/Libraries
 License:        BSD
 URL:            http://github.com/sebastianbergmann/php-token-stream
 Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear >= 1:1.9.4
+BuildRequires:  php(language) >= 5.3.3
+BuildRequires:  php-pear
 BuildRequires:  php-channel(%{channel})
-Requires:       php-channel(%{channel})
-Requires:       php-common >= 5.2.7
+
+Requires:       php(language) >= 5.3.3
+Requires:       php-pcre
+Requires:       php-spl
 Requires:       php-tokenizer
-Requires:       php-pear(components.ez.no/ConsoleTools) >= 1.6 
+Requires:       php-pear
+Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -30,6 +33,7 @@ Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 %description
 Wrapper around PHP tokenizer extension.
 
+
 %prep
 %setup -q -c
 cd %{pear_name}-%{version}
@@ -42,20 +46,20 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 cd %{pear_name}-%{version}
-%{__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_metadir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # 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
@@ -77,6 +81,9 @@ fi
 %{pear_phpdir}/PHP
 
 %changelog
+* Mon Jul 29 2013 Remi Collet <remi@fedoraproject.org> - 1.1.7-1
+- Update to 1.1.7
+
 * Sat Oct  6 2012 Remi Collet <RPMS@FamilleCollet.com> - 1.1.5-1
 - upstream 1.1.5