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

From: @huyubiao 
Reviewed-by: @openeuler-basic 
Signed-off-by: @openeuler-basic
This commit is contained in:
openeuler-ci-bot 2023-07-08 01:11:38 +00:00 committed by Gitee
commit a46b63ef75
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,7 +1,7 @@
%global gitexecdir %{_libexecdir}/git-core
Name: git
Version: 2.27.0
Release: 17
Release: 18
Summary: A popular and widely used Version Control System
License: GPLv2+ or LGPLv2.1
URL: https://git-scm.com/
@ -68,8 +68,8 @@ 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) gdb
Requires: less zlib openssh-clients perl(Term::ReadKey) perl-Git
Obsoletes: %{name}-core %{name}-core-doc %{name}-subtree %{name}-p4 git-cvs < %{version}-%{release}
Provides: %{name} <= %{version}-%{release} %{name}-core %{name}-subtree %{name}-p4
Obsoletes: %{name}-core < %{version}-%{release} %{name}-subtree < %{version}-%{release} %{name}-p4 < %{version}-%{release} git-cvs < %{version}-%{release}
Provides: %{name} = %{version}-%{release} %{name}-core = %{version}-%{release} %{name}-subtree = %{version}-%{release} %{name}-p4 = %{version}-%{release}
%description
Git is a free and open source distributed version control system
@ -110,8 +110,8 @@ Requires: %{name} = %{version}-%{release} tk
Summary: Git web interfaces
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Obsoletes: gitweb %{name}-instaweb
Provides: gitweb %{name}-instaweb
Obsoletes: gitweb < %{version}-%{release} %{name}-instaweb < %{version}-%{release}
Provides: gitweb = %{version}-%{release} %{name}-instaweb = %{version}-%{release}
%description web
Git web interface allows user browsing git repositories via web service.
@ -152,8 +152,8 @@ Requires: git = %{version}-%{release} perl(:MODULE_COMPAT_%(perl -V:versi
%package help
Summary: Man pages and documents for Git system
BuildArch: noarch
Obsoletes: %{name}-core-doc
Provides: %{name}-core-doc
Obsoletes: %{name}-core-doc < %{version}-%{release}
Provides: %{name}-core-doc = %{version}-%{release}
%description help
%{summary}.
@ -312,6 +312,13 @@ make %{?_smp_mflags} test
%{_mandir}/man7/git*.7.*
%changelog
* Fri Jul 7 2023 huyubiao <huyubiao@huawei.com> - 2.27.0-18
- 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.
* Thu Apr 27 2023 fuanan <fuanan3@h-partners.com> - 2.27.0-17
- Type:bugfix
- ID:NA