From f38a0a9f584a3c46bbc560b88ad1538e41ac3084 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 19 Mar 2021 15:16:30 +0100
Subject: [PATCH] Add conflicts with libhandy1 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.
---
 libhandy.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libhandy.spec b/libhandy.spec
index 645414e..a3695e6 100644
--- a/libhandy.spec
+++ b/libhandy.spec
@@ -1,6 +1,6 @@
 Name:           libhandy
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Building blocks for modern adaptive GNOME apps
 License:        LGPLv2+
 
@@ -25,6 +25,7 @@ BuildRequires:  xorg-x11-server-Xvfb
 
 # Retired in F34
 Obsoletes:      libhandy1 < 1.1.90-2
+Conflicts:      libhandy1 < 1.1.90-2
 Provides:       libhandy1 = %{version}-%{release}
 Provides:       libhandy1%{?_isa} = %{version}-%{release}
 
@@ -38,6 +39,7 @@ Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 # Retired in F34
 Obsoletes:      libhandy1-devel < 1.1.90-2
+Conflicts:      libhandy1-devel < 1.1.90-2
 Provides:       libhandy1-devel = %{version}-%{release}
 Provides:       libhandy1-devel%{?_isa} = %{version}-%{release}
 
@@ -89,6 +91,9 @@ developing applications that use %{name}.
 
 
 %changelog
+* Fri Mar 19 2021 Kalev Lember <klember@redhat.com> - 1.2.0-2
+- Add conflicts with libhandy1 packages to help with the upgrade path
+
 * Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 1.2.0-1
 - Update to 1.2.0