Merge branch 'master' into epel7

1 files changed, 9 insertions, 6 deletions

diff --git a/cgit.spec b/cgit.spec
index 5a52dc7..9968486 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -36,7 +36,7 @@ make V=1 %{?_smp_mflags} \\\
 
 Name:           cgit
 Version:        1.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A fast web interface for git
 
 Group:          Development/Tools
@@ -99,12 +99,9 @@ sed -i 's|^\(CFLAGS = \).*|\1%{optflags}|' git/Makefile
 build_dist=%{?fedora:fedora}%{?rhel:rhel}
 build_ver=%{?fedora}%{?rhel}
 
-cgit_context=git_content_t
+cgit_context=git_sys_content_t
 case "$build_dist-$build_ver" in
-    fedora-19|fedora-20|rhel-6|rhel-7)
-        cgit_context=httpd_git_content_t
-        ;;
-    rhel-5|-)
+    rhel-5)
         cgit_context=httpd_sys_content_t
         ;;
 esac
@@ -161,6 +158,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 07 2017 Pavel Raiskup <praiskup@redhat.com> - 1.1-3
+- suggest using correct selinux context (rhbz#1429790)
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Wed Nov 23 2016 Kevin Fenzi <kevin@scrye.com> - 1.1-1
 - Update to 1.1. Fixes bug #1397820