From 64f927c3cc616477efd23a9214ced417d35a244d Mon Sep 17 00:00:00 2001 From: fly_fzc <2385803914@qq.com> Date: Thu, 27 Apr 2023 10:01:30 +0800 Subject: [PATCH] [enable multithreading compilation and installation].[move Git.3pm.gz to perl-Git,avoid installation conflicts].[change BuildRequires from pcre-devel to pcre2-devel]. (cherry picked from commit 1c6de2fdf1181528f769620a53e2c92bc71e2453) --- git.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/git.spec b/git.spec index effc042..d9cfe21 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ %global gitexecdir %{_libexecdir}/git-core Name: git Version: 2.33.0 -Release: 10 +Release: 11 Summary: A popular and widely used Version Control System License: GPLv2+ or LGPLv2.1 URL: https://git-scm.com/ @@ -61,7 +61,7 @@ Patch45: backport-CVE-2023-29007.patch Patch46: backport-CVE-2023-25815-gettext-avoid-using-gettext-if-the-locale-dir-is-not.patch BuildRequires: gcc gettext -BuildRequires: openssl-devel libcurl-devel expat-devel systemd asciidoc xmlto glib2-devel libsecret-devel pcre-devel desktop-file-utils +BuildRequires: openssl-devel libcurl-devel expat-devel systemd asciidoc xmlto glib2-devel libsecret-devel pcre2-devel desktop-file-utils BuildRequires: python3-devel perl-generators perl-interpreter perl-Error perl(Test::More) perl-MailTools perl(Test) Requires: less zlib openssh-clients perl(Term::ReadKey) perl-Git git-core = %{version}-%{release} Obsoletes: %{name}-core-doc %{name}-subtree %{name}-p4 git-cvs < %{version}-%{release} @@ -208,9 +208,9 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ %make_build -C contrib/diff-highlight/ %install -%make_install install-doc -%make_install -C contrib/subtree/ install-doc -%make_install -C contrib/contacts/ install-doc +%make_install %{_smp_mflags} install-doc +%make_install %{_smp_mflags} -C contrib/subtree/ install-doc +%make_install %{_smp_mflags} -C contrib/contacts/ install-doc install -p -m 644 README.md %{buildroot}%{_pkgdocdir} install -p -m 644 gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb @@ -326,6 +326,7 @@ make %{?_smp_mflags} test %{gitexecdir}/*email* %files -n perl-Git -f perl-git-files +%{_mandir}/man3/Git.* %files -n perl-Git-SVN -f perl-git-svn-files @@ -334,11 +335,18 @@ make %{?_smp_mflags} test %exclude %{_pkgdocdir}/{README.md,*.gitweb} %{_pkgdocdir}/* %{_mandir}/man1/git*.1.* -%{_mandir}/man3/Git.* %{_mandir}/man5/git*.5.* %{_mandir}/man7/git*.7.* %changelog +* Thu Apr 27 2023 fuanan - 2.33.0-11 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:enable multithreading compilation and installation, + move Git.3pm.gz to perl-Git,avoid installation conflicts, + change BuildRequires from pcre-devel to pcre2-devel. + * Wed Apr 26 2023 fuanan - 2.33.0-10 - Type:CVE - ID:CVE-2023-25652 CVE-2023-29007 CVE-2023-25815 -- Gitee