summaryrefslogtreecommitdiffstats
path: root/cgit.spec
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2012-11-17 10:53:33 -0700
committerKevin Fenzi <kevin@scrye.com>2012-11-17 10:53:33 -0700
commit0133e5aca591d793031a158f6ff22e103f65cccc (patch)
tree687503c435184d91188bf0a922cfb1eafe268d37 /cgit.spec
parent76866deca74d6d9a6b6f10d61c2b367fce3b61e6 (diff)
downloadcgit_EL6-0133e5aca591d793031a158f6ff22e103f65cccc.tar.gz
Add patch to use correct version of highlight for all branches except epel5
Diffstat (limited to 'cgit.spec')
-rw-r--r--cgit.spec12
1 files changed, 11 insertions, 1 deletions
diff --git a/cgit.spec b/cgit.spec
index ff5e5c0..c8b21f4 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -20,7 +20,7 @@ make V=1 %{?_smp_mflags} \\\
Name: cgit
Version: 0.9.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A fast web interface for git
Group: Development/Tools
@@ -31,6 +31,10 @@ Source1: http://www.kernel.org/pub/software/scm/git/git-%{gitver}.tar.bz2
Source2: cgitrc
Source3: cgit.httpd
Source4: README.SELinux
+# On all but RHEL5 highlight is version 3.
+%if 0%{?fedora} || 0%{?rhel} >= 6
+Patch1: cgit-0.9.1-highlightv3.patch
+%endif
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: asciidoc
@@ -51,6 +55,9 @@ Cgit is a fast web interface for git. It uses caching to increase performance.
%prep
%setup -q -a 1
+%if 0%{?fedora} || 0%{?rhel} >= 6
+%patch1 -p1
+%endif
# setup the git dir
rm -rf git
@@ -94,6 +101,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Nov 17 2012 Kevin Fenzi <kevin@scrye.com> 0.9.1-2
+- Add patch to use correct version of highlight for all branches except epel5
+
* Thu Nov 15 2012 Kevin Fenzi <kevin@scrye.com> 0.9.1-1
- Update to 0.9.1
- Fixes bug #870714 - CVE-2012-4548