From e04c4eae8be9e08395b87253c1ab781242f366af Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 19 Mar 2021 15:04:29 +0100 Subject: [PATCH] Add conflicts with tracker3 packages to help with the upgrade path RHEL gating checks for file conflicts for upgrade path. This adds explicit conflicts between the renamed packages so we don't get file conflicts. --- tracker.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tracker.spec b/tracker.spec index 6d4d0cc..de066f3 100644 --- a/tracker.spec +++ b/tracker.spec @@ -30,6 +30,7 @@ BuildRequires: /usr/bin/dbus-run-session # renamed in F34 Obsoletes: tracker3 < 3.1.0~rc-2 +Conflicts: tracker3 < 3.1.0~rc-2 Provides: tracker3 = %{version}-%{release} Provides: tracker3%{?_isa} = %{version}-%{release} @@ -60,6 +61,7 @@ License: LGPLv2+ Recommends: %{name}%{?_isa} = %{version}-%{release} # renamed in F34 Obsoletes: libtracker-sparql3 < 3.1.0~rc-2 +Conflicts: libtracker-sparql3 < 3.1.0~rc-2 Provides: libtracker-sparql3 = %{version}-%{release} Provides: libtracker-sparql3%{?_isa} = %{version}-%{release} # libtracker-control and libtracker-miner are gone in tracker 3.x @@ -76,6 +78,7 @@ Summary: Development files for %{name} Requires: libtracker-sparql%{?_isa} = %{version}-%{release} # renamed in F34 Obsoletes: tracker3-devel < 3.1.0~rc-2 +Conflicts: tracker3-devel < 3.1.0~rc-2 Provides: tracker3-devel = %{version}-%{release} Provides: tracker3-devel%{?_isa} = %{version}-%{release} @@ -89,6 +92,7 @@ Summary: Documentation for %{name} BuildArch: noarch # renamed in F34 Obsoletes: tracker3-doc < 3.1.0~rc-2 +Conflicts: tracker3-doc < 3.1.0~rc-2 Provides: tracker3-doc = %{version}-%{release} %description doc @@ -167,6 +171,7 @@ The %{name}-devel package contains the documentation for %{name}. %changelog * Fri Mar 19 2021 Kalev Lember - 3.1.0~rc-3 - Obsolete libtracker-control and libtracker-miner +- Add conflicts with tracker3 packages to help with the upgrade path * Fri Mar 19 2021 Kalev Lember - 3.1.0~rc-2 - Update to 3.1.0.rc, based on earlier tracker3 packaging