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

[Christof Damian]

commit fbf3757e1894a1aaa88e956316b669467b654981
Merge: e8d846d 2844650
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 11:26:44 2012 +0200

    Merge branch 'master' into el6

 .gitignore                 |    1 +
 php-phpunit-PHP-Timer.spec |   15 ++++++++++++---
 sources                    |    2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)
---
diff --cc php-phpunit-PHP-Timer.spec
index e3f9759,d8ac2f0..88b19a4
--- a/php-phpunit-PHP-Timer.spec
+++ b/php-phpunit-PHP-Timer.spec
@@@ -14,10 -14,10 +14,10 @@@ Source0:        http://pear.phpunit.de/
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildArch:      noarch
 -BuildRequires:  php-pear >= 1:1.9.2
 +BuildRequires:  php-pear >= 1:1.9.0
  BuildRequires:  php-channel(%{channel})
  Requires:       php-channel(%{channel})
- Requires:       php-common >= 5.2.7
+ Requires:       php-common >= 5.3.3
  Requires(post): %{__pear}
  Requires(postun): %{__pear}