From 1ea41cbd46d4ac427d42fa8c129f56a67fe688ce Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 7 Nov 2022 19:02:33 -0500 Subject: [PATCH] don't ship contrib/persistent-https as documentation This is Go source code which requires compilation to be used. It is licensed differently than git; shipping it changes the License tag. Let's avoid it for now. If it turns out to be widely used, we can restore it later (and ship it in binary form). --- git.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 4ab882b..86ce212 100644 --- a/git.spec +++ b/git.spec @@ -77,7 +77,7 @@ Name: git Version: 2.38.1 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -650,6 +650,10 @@ install -Dpm 0755 contrib/diff-highlight/diff-highlight \ %{buildroot}%{_datadir}/git-core/contrib/diff-highlight rm -rf contrib/diff-highlight/{Makefile,diff-highlight,*.perl,t} +# Remove contrib/persistent-https; a) this code requires compilation; and b) it +# is licensed differently than git +rm -rf contrib/persistent-https + # Remove contrib/scalar to avoid cruft in the git-core-doc docdir rm -rf contrib/scalar @@ -1006,6 +1010,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Mon Nov 07 2022 Todd Zullinger - 2.38.1-2 +- don't ship contrib/persistent-https as documentation + * Tue Oct 18 2022 Todd Zullinger - 2.38.1-1 - update to 2.38.1 (CVE-2022-39253, CVE-2022-39260)