[drupal7/el5: 4/4] EL5 prov Python fix, BZ 995734.

[Peter Borsa]

commit 969ae28b1844ab2f236fac13e332ac16eef9eff2
Merge: 5fc04e6 b074201
Author: Peter Borsa <peter.borsa at gmail.com>
Date:   Sat Aug 10 21:32:31 2013 +0200

    EL5 prov Python fix, BZ 995734.

 .gitignore                     |    1 +
 drupal7.prov.rpm-lt-4-9-compat |    7 +++++--
 drupal7.spec                   |   19 +++++++++++++++++--
 sources                        |    2 +-
 4 files changed, 24 insertions(+), 5 deletions(-)
---
diff --cc drupal7.spec
index 757a2d8,6b2e10a..b0919e6
--- a/drupal7.spec
+++ b/drupal7.spec
@@@ -27,7 -27,8 +27,12 @@@ Patch1:  drupal-7.14-CVE-2012-2922.patc
  
  BuildArch: noarch
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
++<<<<<<< HEAD
 +Requires: php53, php53-gd, php53-mbstring, wget, php53-pdo, php53-xml
++=======
+ Requires: php, php-gd, php-mbstring, wget, php-pdo, php-xml
+ Requires: crontabs
++>>>>>>> master
  
  # Virtual provides
  ## Core