diff --git a/git.spec b/git.spec index bb9de1da01fa553213f05d807d84b39ed822eba7..fe9d6f3730cf868196af67d9f138374521ff4186 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ %global gitexecdir %{_libexecdir}/git-core Name: git Version: 2.27.0 -Release: 14 +Release: 15 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 +* Mon Jul 3 2023 huyubiao - 2.27.0-15 +- 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 - 2.27.0-14 - Type:bugfix - ID:NA