diff --git a/git.spec b/git.spec index d9cfe218229fc785e69b42f37cab3d4d1c2d7818..a6b2e550b17c054c5d00d2e664e8d0cc5b360ddf 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ %global gitexecdir %{_libexecdir}/git-core Name: git Version: 2.33.0 -Release: 11 +Release: 12 Summary: A popular and widely used Version Control System License: GPLv2+ or LGPLv2.1 URL: https://git-scm.com/ @@ -63,7 +63,7 @@ Patch46: backport-CVE-2023-25815-gettext-avoid-using-gettext-if-the-locale-di BuildRequires: gcc gettext 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} +Requires: perl(Term::ReadKey) perl-Git git-core = %{version}-%{release} Obsoletes: %{name}-core-doc %{name}-subtree %{name}-p4 git-cvs < %{version}-%{release} Provides: %{name} <= %{version}-%{release} %{name}-subtree %{name}-p4 @@ -258,7 +258,7 @@ sed -i "/Git\/SVN/ d" perl-git-files # Split core files not_core_re="git-(add--interactive|contacts|credential-netrc|filter-branch|instaweb|request-pull|send-mail)|gitweb" grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core - +grep -E "$not_core_re" bin-man-doc-files > git-bin-files %check make %{?_smp_mflags} test @@ -274,21 +274,24 @@ make %{?_smp_mflags} test %files -f git-bin-files %defattr(-,root,root) -%{_datadir}/git-core/ -%{_datadir}/bash-completion/completions +%{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample +%{_datadir}/git-core/templates/hooks/pre-rebase.sample +%{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample +%{gitexecdir}/git-archimport +%{gitexecdir}/git-credential-libsecret +%{gitexecdir}/git-p4 +%{gitexecdir}/git-subtree +%{gitexecdir}/mergetools/p4merge %doc README.md %license LGPL-2.1 COPYING %files core -f bin-files-core %license LGPL-2.1 COPYING # exclude is best way here because of troubles with symlinks inside git-core/ -%exclude %{_datadir}/git-core/contrib/diff-highlight -%exclude %{_datadir}/git-core/contrib/hooks/multimail -%exclude %{_datadir}/git-core/contrib/hooks/update-paranoid -%exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl %exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample %exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample %exclude %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample +%{_datadir}/locale/{bg,ca,de,el,es,fr,id,is,it,ko,pl,pt_PT,ru,sv,tr,vi,zh_CN,zh_TW}/LC_MESSAGES/git.mo %{_datadir}/bash-completion/completions %{_datadir}/git-core/ @@ -339,6 +342,12 @@ make %{?_smp_mflags} test %{_mandir}/man7/git*.7.* %changelog +* Wed May 17 2023 fuanan - 2.33.0-12 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fix duplicate files in git primary package and subpackage + * Thu Apr 27 2023 fuanan - 2.33.0-11 - Type:bugfix - ID:NA