[php-phpunit-PHP-TokenStream/el6: 4/4] Merge branch 'master' into el6

[Christof Damian]

commit 285d9a55edd3f80c302ba4b249af960874fd423c
Merge: 2a81eb9 fd0916d
Author: Christof Damian <christof at damian.net>
Date:   Tue Nov 1 20:12:07 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	php-phpunit-PHP-TokenStream.spec

 .gitignore                       |    1 +
 php-phpunit-PHP-TokenStream.spec |   17 ++++++++++++++---
 sources                          |    2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --cc php-phpunit-PHP-TokenStream.spec
index a9e3895,7f24776..a0eb6bd
--- a/php-phpunit-PHP-TokenStream.spec
+++ b/php-phpunit-PHP-TokenStream.spec
@@@ -40,8 -40,6 +40,8 @@@ cd %{pear_name}-%{version
  cp /etc/php.ini .
  echo "date.timezone=UTC" >>php.ini
  
- sed -i -r -e 's/\b1\.9\.1\b/1.9.0/' %{name}.xml 
++sed -i -r -e 's/\b1\.9\.4\b/1.9.0/' %{name}.xml 
 +
  %build
  cd %{pear_name}-%{version}
  # Empty build section, most likely nothing required.
@@@ -80,12 -78,20 +80,23 @@@ f
  %defattr(-,root,root,-)
  %{pear_xmldir}/%{name}.xml
  %{pear_phpdir}/PHP
- %{_bindir}/phptok
+ 
+ %doc %{pear_docdir}/%{pear_name}
  
  %changelog
+ * Tue Nov  1 2011 Christof Damian <christof at damian.net> - 1.1.0-2
+ - removed phptok command
+ - added doc dir
+ 
+ * Tue Nov  1 2011 Christof Damian <christof at damian.net> - 1.1.0-1
+ - upstream 1.1.0
+ 
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
 +* Wed Dec  8 2010 Christof Damian <christof at damian.net> - 1.0.1-2
 +- fix pear requirement
 +
  * Sat Dec  4 2010 Christof Damian <christof at damian.net> - 1.0.1-1
  - upstream 1.0.1