From d14f7bd36498292ecd17f115cae7bd362d17d568 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 16 Mar 2021 10:06:56 +0100
Subject: [PATCH] Add explicit conflicts to help with upgrades

sysprof-capture moved from -devel to -capture-devel. Add explicit
conflicts so that dnf wouldn't try to install older -devel package
together with new -capture-devel (which would fail due to file
conflicts).
---
 sysprof.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sysprof.spec b/sysprof.spec
index d5c8d62..fb927a3 100644
--- a/sysprof.spec
+++ b/sysprof.spec
@@ -2,7 +2,7 @@
 
 Name:           sysprof
 Version:        3.39.94
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A system-wide Linux profiler
 
 License:        GPLv3+
@@ -66,6 +66,8 @@ The libsysprof-ui package contains the Sysprof UI library.
 Summary:        Development files for sysprof-capture static library
 License:        BSD-2-Clause-Patent
 Provides:       sysprof-capture-static = %{version}-%{release}
+# Split out in F34
+Conflicts:      %{name}-devel < 3.39.94-1
 
 %description    capture-devel
 The %{name}-capture-devel package contains the sysprof-capture static library and header files.
@@ -162,6 +164,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 
 
 %changelog
+* Tue Mar 16 2021 Kalev Lember <klember@redhat.com> - 3.39.94-2
+- Add explicit conflicts to help with upgrades
+
 * Thu Feb 25 2021 Kalev Lember <klember@redhat.com> - 3.39.94-1
 - Update to 3.39.94