diff options
author | Kevin Fenzi <kevin@scrye.com> | 2017-07-24 15:18:47 -0700 |
---|---|---|
committer | Kevin Fenzi <kevin@scrye.com> | 2017-07-24 15:18:47 -0700 |
commit | c55a61082eca575f3bc37be1d12c4674187879db (patch) | |
tree | 4ef35af05ff66f759aa82757d1c78dca56778d94 /cgit.spec | |
parent | 3ede86ef29356c3872d74c6db76a3c78db4fd234 (diff) | |
download | cgit_EL6-c55a61082eca575f3bc37be1d12c4674187879db.tar.gz |
Fix httpd requirements on epel7. Fixes bug #1468839
Diffstat (limited to 'cgit.spec')
-rw-r--r-- | cgit.spec | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -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) |