From 26a463b4bc211ef4e6267d5317e37262755e6d8e Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <limburgher@gmail.com>
Date: Jun 12 2017 13:00:58 +0000
Subject: Merge branch 'epel7' into el6


---

diff --git a/drupal7.spec b/drupal7.spec
index 6a9e987..be0dfc7 100644
--- a/drupal7.spec
+++ b/drupal7.spec
@@ -7,7 +7,7 @@ AutoReqProv: no
 %define drupaldir %{_datadir}/drupal7
 Name: drupal7
 Version:  7.55
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary: An open-source content-management platform
 
 Group: Applications/Publishing
@@ -30,8 +30,13 @@ Patch1:  drupal-7.14-CVE-2012-2922.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: php(httpd), php-gd, php-mbstring, wget, php-pdo, php-xml
+Requires: php-gd, php-mbstring, wget, php-pdo, php-xml
 Requires: crontabs
+%if 0%{?rhel}
+Requires: php
+%else
+Requires: php(httpd)
+%endif
 
 # Virtual provides
 ## Core
@@ -190,6 +195,9 @@ rm -rf %{buildroot}
 %{_prefix}/lib/rpm/%{name}.req
 
 %changelog
+* Mon Jun 12 2017 Gwyn Ciesla <limburgher@gmail.com> - 7.55-2
+- Requires fix for EPEL.
+
 * Thu Jun 08 2017 Gwyn Ciesla <limburgher@gmail.com> - 7.55-1
 - 7.55.