[cgit/epel7] spec: require any webserver instead of httpd

Pavel Raiskup praiskup at fedoraproject.org
Mon Feb 9 07:04:15 UTC 2015


commit 802dbc490f3e8613e2e7946ce1ecbd910af516bb
Author: Pavel Raiskup <praiskup at redhat.com>
Date:   Mon Feb 9 08:03:17 2015 +0100

    spec: require any webserver instead of httpd
    
    Resolves: #1138599
    Version: 0.10.2-4

 cgit.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/cgit.spec b/cgit.spec
index e6bf832..f162ad6 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -36,7 +36,7 @@ make V=1 %{?_smp_mflags} \\\
 
 Name:           cgit
 Version:        0.10.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A fast web interface for git
 
 Group:          Development/Tools
@@ -66,7 +66,7 @@ BuildRequires:  curl-devel
 %endif
 BuildRequires:  openssl-devel
 BuildRequires:  lua-devel
-Requires:       httpd
+Requires:       webserver
 
 %description
 Cgit is a fast web interface for git.  It uses caching to increase performance.
@@ -141,6 +141,10 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc COPYING README* *.html
 %config(noreplace) %{_sysconfdir}/cgitrc
+# 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
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/cgit.conf
 %dir %attr(-,apache,root) %{cachedir}
 %{cgitdata}
@@ -150,6 +154,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb 09 2015 Pavel Raiskup <praiskup at redhat.com> - 0.10.2-4
+- require "any" 'webserver' instead of concrete 'httpd' (#1138599)
+
 * Tue Jul 08 2014 Pavel Raiskup <praiskup at redhat.com> - 0.10.2-3
 - currently epel-7-ppc64 does not have highlight package (#1117261)
 


More information about the scm-commits mailing list