[drupal7/el5: 2/2] Merge branch 'master' into el5

[Peter Borsa]

commit e73c31eb94faf9c8d3822980cabab1f7ad6494fc
Merge: b8d1184 5bd84e6
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Thu Mar 7 10:55:17 2013 +0100

    Merge branch 'master' into el5

 .gitignore   |    1 +
 drupal7.spec |   13 ++++++++-----
 sources      |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --cc drupal7.spec
index 7b65fdd,0b2a27d..be72be9
--- a/drupal7.spec
+++ b/drupal7.spec
@@@ -17,10 -17,10 +17,10 @@@ Patch1:  drupal-7.14-CVE-2012-2922.patc
  
  BuildArch: noarch
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 -Requires: php, php-gd, php-mbstring, wget, php-pdo, php-xml
 +Requires: php53, php53-gd, php53-mbstring, wget, php53-pdo, php53-xml
  
  %description
- Equipped with a powerful blend of features, Drupal is a Content Management 
+ Equipped with a powerful blend of features, Drupal is a Content Management
  System written in PHP that can support a variety of websites ranging from
  personal weblogs to large community-driven websites.  Drupal is highly
  configurable, skinnable, and secure.