[php-phpunit-PHP-TokenStream/f20] update to 1.2.2 + cleanups

[Remi Collet]

commit 8cb90934c32ade4c6f05c8c0d1be505ed11e02f7
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Mar 3 13:57:58 2014 +0100

    update to 1.2.2 + cleanups
    
    (cherry picked from commit 6c85f9fe65d0ca12d8365f20ce97b1e9489035be)

 .gitignore                       |    1 +
 php-phpunit-PHP-TokenStream.spec |   26 ++++++++++++--------------
 sources                          |    2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d98ffe1..6765561 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /PHP_TokenStream-1.1.7.tgz
 /PHP_TokenStream-1.2.0.tgz
 /PHP_TokenStream-1.2.1.tgz
+/PHP_TokenStream-1.2.2.tgz
diff --git a/php-phpunit-PHP-TokenStream.spec b/php-phpunit-PHP-TokenStream.spec
index c8d7338..55beb8c 100644
--- a/php-phpunit-PHP-TokenStream.spec
+++ b/php-phpunit-PHP-TokenStream.spec
@@ -4,7 +4,7 @@
 %global channel       pear.phpunit.de
 
 Name:           php-phpunit-PHP-TokenStream
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Wrapper around PHP tokenizer extension
 
@@ -12,16 +12,18 @@ 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)
 
 BuildArch:      noarch
+BuildRequires:  php(language) >= 5.3.3
 BuildRequires:  php-pear(PEAR) >= 1.9.4
 BuildRequires:  php-channel(%{channel})
 
+Requires:       php(language) >= 5.3.3
+Requires:       php-pcre
+Requires:       php-spl
+Requires:       php-tokenizer
 Requires:       php-pear(PEAR) >= 1.9.4
 Requires:       php-channel(%{channel})
-Requires:       php-common >= 5.3.3
-Requires:       php-tokenizer
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 
@@ -31,12 +33,11 @@ Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 %description
 Wrapper around PHP tokenizer extension.
 
+
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
-
 cd %{pear_name}-%{version}
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -45,7 +46,6 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf %{buildroot}
 cd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
@@ -57,10 +57,6 @@ mkdir -p %{buildroot}%{pear_xmldir}
 install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
 %{__pear} install --nodeps --soft --force --register-only \
   %{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -74,13 +70,15 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
+%doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/PHP
 
-%doc %{pear_docdir}/%{pear_name}
 
 %changelog
+* Mon Mar 03 2014 Remi Collet <remi at fedoraproject.org> - 1.2.2-1
+- Update to 1.2.2
+
 * Sun Nov  3 2013 Christof Damian <christof at damian.net> - 1.2.1-1
 - upstream 1.2.1
 
diff --git a/sources b/sources
index 452aaba..25c0257 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ff2885f210a29a16489f03c29a38ece  PHP_TokenStream-1.2.1.tgz
+32bff1c54a4186f42fcc3be77e47006f  PHP_TokenStream-1.2.2.tgz