Merge remote-tracking branch 'origin/master' into epel7

2 files changed, 11 insertions, 5 deletions

diff --git a/cgit.spec b/cgit.spec
index 9968486..4b001b8 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -36,7 +36,7 @@ make V=1 %{?_smp_mflags} \\\
 
 Name:           cgit
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A fast web interface for git
 
 Group:          Development/Tools
@@ -74,8 +74,6 @@ BuildRequires:  lua-devel
 # just to be able to install httpd configuration correctly, FC21+
 Requires:       httpd-filesystem
 Requires:       webserver
-%else
-Requires:       httpd
 %endif
 
 
@@ -149,6 +147,12 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README* *.html
 %config(noreplace) %{_sysconfdir}/cgitrc
+%if 0%{?rhel} == 7
+# Keep those two httpd-owned directories listed here until httpd-filesystem
+# becomes part of EPEL.  See rhbz#1138599 for more details.
+%dir %{_sysconfdir}/httpd
+%dir %{_sysconfdir}/httpd/conf.d
+%endif
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/cgit.conf
 %dir %attr(-,apache,root) %{cachedir}
 %{cgitdata}
@@ -158,6 +162,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jul 24 2017 Kevin Fenzi <kevin@scrye.com> - 1.1-4
+- Fix httpd requirements on epel7. Fixes bug #1468839
+
 * Tue Mar 07 2017 Pavel Raiskup <praiskup@redhat.com> - 1.1-3
 - suggest using correct selinux context (rhbz#1429790)
 
diff --git a/sources b/sources
index cc792b2..a57302d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-7cc92b94e4aaefed952b0e6b8fde0a3e  cgit-1.1.tar.xz
-3cd1dca37be60668f482545716923b72  git-2.10.2.tar.xz
+SHA512 (cgit-1.1.tar.xz) = 8f2ec418716d7a6f0880a713b622f2ee41217dc2d5462903841d59d978a021a8bc2be667ca65c25baee2b9dcd4a76bddd0c813bda0486109cc694e7610827051