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

!126 Specifying Obsoletes and Provides version numbers, prevent upgrade conflicts. Delete git-core-doc from git, git-core-doc is provided by git-help.

Browse Source 
From: @huyubiao 
Reviewed-by: @openeuler-basic 
Signed-off-by: @openeuler-basic
This commit is contained in:
openeuler-ci-bot 2023-07-07 02:34:25 +00:00 committed by Gitee
commit 94e45d7377
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
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: 7 Release: 8
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/
@ -30,8 +30,8 @@ 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: 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}-subtree < %{version}-%{release} %{name}-p4 < %{version}-%{release} git-cvs < %{version}-%{release}
Provides: %{name} <= %{version}-%{release} %{name}-subtree %{name}-p4 Provides: %{name} = %{version}-%{release} %{name}-subtree = %{version}-%{release} %{name}-p4 = %{version}-%{release}
%description %description
Git is a free and open source distributed version control system Git is a free and open source distributed version control system
@ -87,8 +87,8 @@ Requires: %{name} = %{version}-%{release} tk
Summary: Git web interfaces Summary: Git web interfaces
BuildArch: noarch BuildArch: noarch
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Obsoletes: gitweb %{name}-instaweb Obsoletes: gitweb < %{version}-%{release} %{name}-instaweb < %{version}-%{release}
Provides: gitweb %{name}-instaweb Provides: gitweb = %{version}-%{release} %{name}-instaweb = %{version}-%{release}
%description web %description web
Git web interface allows user browsing git repositories via web service. Git web interface allows user browsing git repositories via web service.
@ -129,8 +129,8 @@ Requires: git = %{version}-%{release} perl(:MODULE_COMPAT_%(perl -V:versi
%package help %package help
Summary: Man pages and documents for Git system Summary: Man pages and documents for Git system
BuildArch: noarch BuildArch: noarch
Obsoletes: %{name}-core-doc Obsoletes: %{name}-core-doc < %{version}-%{release}
Provides: %{name}-core-doc Provides: %{name}-core-doc = %{version}-%{release}
%description help %description help
%{summary}. %{summary}.
@ -309,6 +309,13 @@ make %{?_smp_mflags} test
%{_mandir}/man7/git*.7.* %{_mandir}/man7/git*.7.*
%changelog %changelog
* Mon Jul 3 2023 huyubiao <huyubiao@huawei.com> - 2.39.1-8
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Specifying Obsoletes and Provides version numbers, prevent upgrade conflicts.
Delete git-core-doc from git, git-core-doc is provided by git-help.
* Wed May 17 2023 fuanan <fuanan3@h-partners.com> - 2.39.1-7 * Wed May 17 2023 fuanan <fuanan3@h-partners.com> - 2.39.1-7
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA