From cf5fc1863fd25f6f450b3415cb21b224b18cf500 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 8 Sep 2018 01:26:14 -0400 Subject: [PATCH] Drop unnecessary Conflicts: when git-p4 is disabled The Obsoletes: tag is sufficient to ensure git-p4 is removed when updating to a newer git which lacks a git-p4 subpackage. --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index c690689..c699524 100644 --- a/git.spec +++ b/git.spec @@ -220,7 +220,6 @@ Obsoletes: git-gnome-keyring < 2.11.1-4 # Obsolete git-p4 if it's disabled %if %{without p4} Obsoletes: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release} -Conflicts: git-p4 < %{?epoch:%{epoch}:}%{version}-%{release} %endif %description @@ -881,6 +880,7 @@ make -C contrib/credential/netrc/ testverbose %changelog * 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 * Tue Sep 04 2018 Nils Philippsen - 2.19.0-0.2.rc1 - obsolete git-p4 if it's disabled