summaryrefslogtreecommitdiffstats
path: root/cgit.spec
diff options
context:
space:
mode:
Diffstat (limited to 'cgit.spec')
-rw-r--r--cgit.spec13
1 files changed, 10 insertions, 3 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)