From 601f4c9e870f774e878d93e3046f8431a2c9d5b7 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 4 Sep 2018 20:39:54 -0400 Subject: [PATCH] Obsolete git-cvs if it's disabled Similar to git-p4 in 5032bef ("bump release", 2018-09-04), add Obsoletes: for git-cvs when it is disabled. --- git.rpmlintrc | 4 ++-- git.spec | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index e7911a4..ca9c075 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -19,5 +19,5 @@ addFilter("perl-Git-SVN.noarch: W: no-documentation") addFilter("git-core\..*: W: no-manual-page-for-binary") # nothing provides git-gnome-keyring, it's simply obsolete -# similarly ignore the warning when git-p4 is disabled -addFilter("git.* obsolete-not-provided git-(gnome-keyring|p4)") +# similarly ignore the warning when git-cvs and git-p4 are disabled +addFilter("git.* obsolete-not-provided git-(cvs|gnome-keyring|p4)") diff --git a/git.spec b/git.spec index c699524..4af2689 100644 --- a/git.spec +++ b/git.spec @@ -214,6 +214,11 @@ Requires: perl-Git = %{version}-%{release} Requires: emacs-filesystem >= %{_emacs_version} %endif +# Obsolete git-cvs if it's disabled +%if %{without cvs} +Obsoletes: git-cvs < %{?epoch:%{epoch}:}%{version}-%{release} +%endif + # Obsolete gnome-keyring credential helper (remove after Fedora 29) Obsoletes: git-gnome-keyring < 2.11.1-4 @@ -881,6 +886,7 @@ make -C contrib/credential/netrc/ testverbose * Tue Sep 04 2018 Todd Zullinger - 2.19.0-0.3.rc2 - Update to 2.19.0.rc2 - Drop unnecessary Conflicts: when git-p4 is disabled +- Obsolete git-cvs if it's disabled * Tue Sep 04 2018 Nils Philippsen - 2.19.0-0.2.rc1 - obsolete git-p4 if it's disabled