summaryrefslogtreecommitdiffstats
path: root/cgit.spec
diff options
context:
space:
mode:
Diffstat (limited to 'cgit.spec')
-rw-r--r--cgit.spec22
1 files changed, 19 insertions, 3 deletions
diff --git a/cgit.spec b/cgit.spec
index dcf72d7..c59d76b 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -1,7 +1,7 @@
# Review bug: https://bugzilla.redhat.com/479723
# Defaults
-%global gitver 2.25.1
+%global gitver 2.34.1
%global cachedir %{_localstatedir}/cache/%{name}
%global filterdir %{_libexecdir}/%{name}/filters
%global scriptdir %{_localstatedir}/www/cgi-bin
@@ -31,7 +31,7 @@
Name: cgit
Version: 1.2.3
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A fast web interface for git
License: GPLv2
@@ -68,7 +68,20 @@ Patch0: 0001-use-highlight-3-by-default.patch
# https://lists.zx2c4.com/pipermail/cgit/2020-August/004513.html
Patch1: https://git.zx2c4.com/cgit/patch/?id=bd6f5683f#/0001-t0107-support-older-and-or-non-GNU-tar.patch
-# Security guys might try to repoquery for this.
+# Update to current git
+#
+# This is a compilation of patches Christian Hesse has sent to the cgit list.
+# It was created somewhat manually by reviewing the number of patches since the
+# last update to git-2.25.1 (14). Then patch was generated via:
+#
+# git log --grep=git: --format='%h' --reverse -14 origin/ch/for-jason |
+# while read c _; do
+# git format-patch -1 --ignore-submodules --no-signature --stdout $c
+# done >~/src/dist/fedora/cgit/cgit-1.2.3-update-to-git-2.34.1.patch
+Patch2: cgit-1.2.3-update-to-git-2.34.1.patch
+
+# Note the bundled git, per the packaging guidelines
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/#bundling
Provides: bundled(git) = %gitver
%if %{with highlight}
@@ -214,6 +227,9 @@ make test
%changelog
+* Sun Jan 02 2022 Todd Zullinger <tmz@pobox.com> - 1.2.3-8
+- update to git-2.34.1
+
* Mon Jul 26 2021 Todd Zullinger <tmz@pobox.com> - 1.2.3-7
- update SELinux README
- simplify install commands