summaryrefslogtreecommitdiffstats
path: root/cgit.spec
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2017-07-24 19:56:01 -0400
committerTodd Zullinger <tmz@pobox.com>2017-07-24 20:01:26 -0400
commitcc6123c5a3fbb8c0a0d4330de7e1b9d5a760087f (patch)
treed6891307ea5d4a1776f6871b8e2751f19adc5de7 /cgit.spec
parent9782c8e8ebb1412478d18207df0eb1bc729d1462 (diff)
downloadcgit_EL6-cc6123c5a3fbb8c0a0d4330de7e1b9d5a760087f.tar.gz
Require webserver on all dists (#1468839)
This was the intention of the previous commit, to ensure webserver is required on epel as well as fedora releases. The httpd-filesystem package is now required on fedora and on epel we simply own the %{_sysconfdir}/httpd{,/conf.d} directories.
Diffstat (limited to 'cgit.spec')
-rw-r--r--cgit.spec9
1 files changed, 6 insertions, 3 deletions
diff --git a/cgit.spec b/cgit.spec
index 4b001b8..5621cf1 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -36,7 +36,7 @@ make V=1 %{?_smp_mflags} \\\
Name: cgit
Version: 1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A fast web interface for git
Group: Development/Tools
@@ -73,8 +73,8 @@ BuildRequires: lua-devel
%if 0%{?fedora}
# just to be able to install httpd configuration correctly, FC21+
Requires: httpd-filesystem
-Requires: webserver
%endif
+Requires: webserver
%description
@@ -147,7 +147,7 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%doc COPYING README* *.html
%config(noreplace) %{_sysconfdir}/cgitrc
-%if 0%{?rhel} == 7
+%if 0%{?rhel} && 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
@@ -162,6 +162,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jul 24 2017 Todd Zullinger <tmz@pobox.com> - 1.1-5
+- Require webserver on all dists (#1468839)
+
* Mon Jul 24 2017 Kevin Fenzi <kevin@scrye.com> - 1.1-4
- Fix httpd requirements on epel7. Fixes bug #1468839