From cc6123c5a3fbb8c0a0d4330de7e1b9d5a760087f Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 24 Jul 2017 19:56:01 -0400 Subject: 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. --- cgit.spec | 9 ++++++--- 1 file 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 - 1.1-5 +- Require webserver on all dists (#1468839) + * Mon Jul 24 2017 Kevin Fenzi - 1.1-4 - Fix httpd requirements on epel7. Fixes bug #1468839 -- cgit