packages/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!122 Fix duplicate files in git primary package and subpackage

Browse Source 
From: @fly_fzc 
Reviewed-by: @openeuler-basic 
Signed-off-by: @openeuler-basic
This commit is contained in:
openeuler-ci-bot 2023-05-18 07:49:11 +00:00 committed by Gitee
commit a8194272ac
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git.spec
View File

@ -1,7 +1,7 @@
%global gitexecdir %{_libexecdir}/git-core %global gitexecdir %{_libexecdir}/git-core
Name: git Name: git
Version: 2.39.1 Version: 2.39.1
Release: 6 Release: 7
Summary: A popular and widely used Version Control System Summary: A popular and widely used Version Control System
License: GPLv2+ or LGPLv2.1 License: GPLv2+ or LGPLv2.1
URL: https://git-scm.com/ URL: https://git-scm.com/
@ -29,7 +29,7 @@ Patch12: backport-CVE-2023-25815-gettext-avoid-using-gettext-if-the-locale-di
BuildRequires: gcc gettext BuildRequires: gcc gettext
BuildRequires: openssl-devel libcurl-devel expat-devel systemd asciidoc xmlto glib2-devel libsecret-devel pcre2-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) 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} Obsoletes: %{name}-core-doc %{name}-subtree %{name}-p4 git-cvs < %{version}-%{release}
Provides: %{name} <= %{version}-%{release} %{name}-subtree %{name}-p4 Provides: %{name} <= %{version}-%{release} %{name}-subtree %{name}-p4
@ -224,7 +224,7 @@ sed -i "/Git\/SVN/ d" perl-git-files
# Split core files # Split core files
not_core_re="git-(add--interactive|contacts|credential-netrc|filter-branch|instaweb|request-pull|send-mail)|gitweb" 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 -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 %check
make %{?_smp_mflags} test make %{?_smp_mflags} test
@ -243,6 +243,11 @@ make %{?_smp_mflags} test
%{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample
%{_datadir}/git-core/templates/hooks/pre-rebase.sample %{_datadir}/git-core/templates/hooks/pre-rebase.sample
%{_datadir}/git-core/templates/hooks/prepare-commit-msg.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 %doc README.md
%license LGPL-2.1 COPYING %license LGPL-2.1 COPYING
@ -252,6 +257,7 @@ make %{?_smp_mflags} test
%exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample %exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample
%exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample %exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample
%exclude %{_datadir}/git-core/templates/hooks/prepare-commit-msg.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}/bash-completion/completions
%{_datadir}/git-core/ %{_datadir}/git-core/
@ -303,6 +309,12 @@ make %{?_smp_mflags} test
%{_mandir}/man7/git*.7.* %{_mandir}/man7/git*.7.*
%changelog %changelog
* Wed May 17 2023 fuanan <fuanan3@h-partners.com> - 2.39.1-7
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Fix duplicate files in git primary package and subpackage
* Thu Apr 27 2023 fuanan <fuanan3@h-partners.com> - 2.39.1-6 * Thu Apr 27 2023 fuanan <fuanan3@h-partners.com> - 2.39.1-6
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA