[php-phpunit-phploc/el6: 16/16] Merge branch 'master' into el6

[Christof Damian]

commit 6950633172f2dcc6674545b9e58f79bae29b5f77
Merge: 878f5d8 3bb5c18
Author: Christof Damian <christof at damian.net>
Date:   Sat Nov 5 14:50:10 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	php-phpunit-phploc.spec
    	sources

 .gitignore              |    3 +--
 php-phpunit-phploc.spec |   13 ++++++++-----
 sources                 |    2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index fbf323b,f7ce74f..7898021
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--phploc-1.5.1.tgz
--/phploc-1.6.1.tgz
+ /phploc-1.6.2.tgz
diff --cc php-phpunit-phploc.spec
index be0ce0c,f71dee0..8602de2
--- a/php-phpunit-phploc.spec
+++ b/php-phpunit-phploc.spec
@@@ -41,8 -41,8 +41,8 @@@ need to get a quick understanding of a 
  cd %{pear_name}-%{version}
  
  # Change pearinstaller version
- %if 0%{?rhel} <= 6
-     %{__sed} -i -e "s@<min>1.9.1</min>@<min>1.9.0</min>@" %{name}.xml
+ %if 0%{?rhel} && 0%{?rhel} <= 6
 -    %{__sed} -i -e "s@<min>1.9.1</min>@<min>1.9.0</min>@" %{name}.xml
++    %{__sed} -i -e "s@<min>1.9.4</min>@<min>1.9.0</min>@" %{name}.xml
  %endif