From f45e29cabeefa68b80f4a193cf0cd8ccbfd8961e Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <limburgher@gmail.com>
Date: Jun 08 2017 12:41:48 +0000
Subject: Merge branch 'master' into epel7


---

diff --git a/.gitignore b/.gitignore
index e4340c1..7aadd45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@
 /drupal-7.52.tar.gz
 /drupal-7.53.tar.gz
 /drupal-7.54.tar.gz
+/drupal-7.55.tar.gz
diff --git a/drupal7.spec b/drupal7.spec
index fa2c6f4..6a9e987 100644
--- a/drupal7.spec
+++ b/drupal7.spec
@@ -6,7 +6,7 @@ AutoReqProv: no
 
 %define drupaldir %{_datadir}/drupal7
 Name: drupal7
-Version:  7.54
+Version:  7.55
 Release:  1%{?dist}
 Summary: An open-source content-management platform
 
@@ -30,7 +30,7 @@ Patch1:  drupal-7.14-CVE-2012-2922.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: php, php-gd, php-mbstring, wget, php-pdo, php-xml
+Requires: php(httpd), php-gd, php-mbstring, wget, php-pdo, php-xml
 Requires: crontabs
 
 # Virtual provides
@@ -190,6 +190,15 @@ rm -rf %{buildroot}
 %{_prefix}/lib/rpm/%{name}.req
 
 %changelog
+* Thu Jun 08 2017 Gwyn Ciesla <limburgher@gmail.com> - 7.55-1
+- 7.55.
+
+* Wed Mar 15 2017 Jon Ciesla <limburgher@gmail.com> - 7.54-3
+- Require php(httpd), not php, BZ 1268937.
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.54-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Thu Feb 02 2017 Jon Ciesla <limburgher@gmail.com> - 7.54-1
 - 7.54.
 
diff --git a/sources b/sources
index 783eb25..ad2683e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (drupal-7.54.tar.gz) = 0b2834cd2ec7778de1515b99ac7f6348c5a3632a670b882fcce1e3b9d4cc904f9da761c103a3fe70311c69563c8ba5178d76ac8e2938d0831d7ef4113abaaf2a
+SHA512 (drupal-7.55.tar.gz) = f162ebc92eee16a1203c6907c4197a0eaa184c75cdb2be5b90873ac7f112e07c6dacf570d89dc3431b1533a87eb8a8c9f15d0ac642060445121068215b295fb0