From e0624e485ab38dd4b2678aa3cc6150736515a135 Mon Sep 17 00:00:00 2001
From: h30032433 <huyubiao@huawei.com>
Date: Mon, 3 Jul 2023 20:21:15 +0800
Subject: [PATCH] Specifying Obsoletes and Provides version numbers, prevent
 upgrade conflicts. Delete git-core-doc from git, git-core-doc is provided by
 git-help.

---
 git.spec | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/git.spec b/git.spec
index fa6a10c..e786766 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/
@@ -64,8 +64,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)
 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
@@ -106,8 +106,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.
@@ -148,8 +148,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}.
@@ -302,6 +302,13 @@ make %{?_smp_mflags} test
 %{_mandir}/man7/git*.7.*
 
 %changelog
+* Mon Jul 3 2023 huyubiao <huyubiao@huawei.com> - 2.33.0-11
+- 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.33.0-10
 - Type:bugfix
 - ID:NA
-- 
Gitee