[php-phpunit-PHP-TokenStream] update to 1.1.2

Remi Collet remi at fedoraproject.org
Tue Jan 17 17:39:41 UTC 2012


commit d87d3dde07deafd4d4884051d6a228cc8cb6cf15
Author: remi <fedora at famillecollet.com>
Date:   Tue Jan 17 18:39:14 2012 +0100

    update to 1.1.2

 .gitignore                       |    1 +
 php-phpunit-PHP-TokenStream.spec |   29 ++++++++++++++++-------------
 sources                          |    2 +-
 3 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ab60f3c..8985991 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /PHP_TokenStream-1.0.1.tgz
 /PHP_TokenStream-1.1.0.tgz
 /PHP_TokenStream-1.1.1.tgz
+/PHP_TokenStream-1.1.2.tgz
diff --git a/php-phpunit-PHP-TokenStream.spec b/php-phpunit-PHP-TokenStream.spec
index da6cebb..8aea427 100644
--- a/php-phpunit-PHP-TokenStream.spec
+++ b/php-phpunit-PHP-TokenStream.spec
@@ -3,8 +3,8 @@
 %global channel       pear.phpunit.de
 
 Name:           php-phpunit-PHP-TokenStream
-Version:        1.1.1
-Release:        2%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Wrapper around PHP tokenizer extension
 
 Group:          Development/Libraries
@@ -14,8 +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.9.4
+BuildRequires:  php-pear(PEAR) >= 1.9.4
 BuildRequires:  php-channel(%{channel})
+
+Requires:       php-pear(PEAR) >= 1.9.4
 Requires:       php-channel(%{channel})
 Requires:       php-common >= 5.2.7
 Requires:       php-tokenizer
@@ -32,13 +34,10 @@ 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
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
 
 cd %{pear_name}-%{version}
 
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
 
 %build
 cd %{pear_name}-%{version}
@@ -46,20 +45,20 @@ cd %{pear_name}-%{version}
 
 
 %install
+rm -rf %{buildroot}
 cd %{pear_name}-%{version}
-%{__rm} -rf $RPM_BUILD_ROOT docdir
-PHPRC=./php.ini %{__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
@@ -82,6 +81,10 @@ fi
 %doc %{pear_docdir}/%{pear_name}
 
 %changelog
+* Tue Jan 17 2012 Remi Collet <remi at fedoraproject.org> - 1.1.2-1
+- Update to 1.1.2 (stable) - API 1.1.0 (stable)
+- unmacro current command
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index e4037bd..5e875c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-807d6d5fa7eb3d416270413ce3b0482c  PHP_TokenStream-1.1.1.tgz
+23e6efa18024d5f0e3afc90ab63e3cc8  PHP_TokenStream-1.1.2.tgz


More information about the scm-commits mailing list