summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cgit.spec18
1 files changed, 2 insertions, 16 deletions
diff --git a/cgit.spec b/cgit.spec
index e71253e..defc189 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -8,11 +8,6 @@
%global syntax_highlight 1
-%if 0%{?rhel} && 0%{?rhel} <= 5
-# On el5, manual actions are needed to make syntax highlighting work
-%global syntax_highlight 0
-%endif
-
# Temporarily -- in epel-7-ppc64 is not highlight package currently, #1117261
%if 0%{?rhel} == 7
%ifarch ppc64
@@ -51,16 +46,12 @@ Source3: README.SELinux
Provides: bundled(git) = %gitver
%if %{syntax_highlight}
-# On all but RHEL5 highlight is version 3.
+# All supported releases use hightlight version 3.
Patch1: cgit-0.9.1-highlightv3.patch
BuildRequires: highlight
%endif
BuildRequires: asciidoc
-%if 0%{?rhel} && 0%{?rhel} <= 5
-# These are missing asciidoc requirements
-BuildRequires: docbook-style-xsl libxslt
-%endif
%if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: libcurl-devel
%else
@@ -97,12 +88,6 @@ build_dist=%{?fedora:fedora}%{?rhel:rhel}
build_ver=%{?fedora}%{?rhel}
cgit_context=git_sys_content_t
-case "$build_dist-$build_ver" in
- rhel-5)
- cgit_context=httpd_sys_content_t
- ;;
-esac
-
sed -e "s|@CGIT_CONTEXT@|$cgit_context|g" \
%{SOURCE3} > README.SELinux
@@ -160,6 +145,7 @@ install -d -m0755 %{buildroot}%{cachedir}
%changelog
* Sun Feb 18 2018 Todd Zullinger <tmz@pobox.com> - 1.1-10
- Use https for source URLs
+- Remove el5 conditionals
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild