[python-django-horizon/el6-icehouse] really include httpd-2.4 config for el7

[Matthias Runge]

commit a03a5a64ad398c0d813b9549711dd659c33abe90
Author: Matthias Runge <mrunge at redhat.com>
Date:   Tue Jul 1 08:38:23 2014 +0200

    really include httpd-2.4 config for el7

 python-django-horizon.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index a6360ab..44aadd4 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -2,7 +2,7 @@
 
 Name:       python-django-horizon
 Version:    2014.1.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Django application for talking to Openstack
 
 Group:      Development/Libraries
@@ -221,7 +221,7 @@ rm -fr html/.doctrees html/.buildinfo
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 # drop httpd-conf snippet
-%if 0%{?rhel} || 0%{?fedora} <18
+%if 0%{?rhel} == 6 || 0%{?fedora} <18
 install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
 %else
 # httpd-2.4 changed the syntax
@@ -345,6 +345,9 @@ sed -i 's:^SECRET_KEY =.*:SECRET_KEY = "badcafe":' openstack_dashboard/local/loc
 %{_datadir}/openstack-dashboard/openstack_dashboard_theme
 
 %changelog
+* Mon Jun 30 2014 Matthias Runge <mrunge at redhat.com> - 2014.1.1-2
+- python-django-horizon..el7 installs wrong httpd config (rhbz#113721)
+
 * Tue Jun 17 2014 Matthias Runge <mrunge at redhat.com> - 2014.1.1-1
 - rebase to 2014.1.1
 - moved to git patch management