From f336f0534e44a949e89594d7ba56d7190ca07626c68df71574cf9ae3f4a8b5fa Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe+obs@krop.fr>
Date: Tue, 12 Mar 2024 22:10:41 +0000
Subject: [PATCH] Accepting request 1157299 from
 home:alarrosa:branches:KDE:Frameworks5

- Add conflict in appstream-qt6-devel with
  libAppStreamQt-devel < 1.0. This is required to fix a file
  conflict in SLE with the old libAppStreamQt-devel package.


This fixes the following file conflict:

found conflict of appstream-qt6-devel-1.0.2-150600.1.1.x86_64 with libAppStreamQt-devel-0.15.6-150500.1.1.x86_64
  /usr/lib64/libAppStreamQt.so
  /usr/include/AppStreamQt/appstreamqt_export.h
  /usr/include/AppStreamQt/bundle.h
  /usr/include/AppStreamQt/category.h
  /usr/include/AppStreamQt/component.h
  /usr/include/AppStreamQt/contentrating.h
  /usr/include/AppStreamQt/icon.h
  /usr/include/AppStreamQt/image.h
  /usr/include/AppStreamQt/launchable.h
  /usr/include/AppStreamQt/metadata.h
  /usr/include/AppStreamQt/pool.h
  /usr/include/AppStreamQt/provided.h
  /usr/include/AppStreamQt/relation.h
  /usr/include/AppStreamQt/release.h
  /usr/include/AppStreamQt/screenshot.h
  /usr/include/AppStreamQt/spdx.h
  /usr/include/AppStreamQt/suggested.h
  /usr/include/AppStreamQt/translation.h
  /usr/include/AppStreamQt/utils.h
  /usr/include/AppStreamQt/version.h
  /usr/include/AppStreamQt/video.h
  /usr/lib64/cmake/AppStreamQt/AppStreamQtConfig.cmake
  /usr/lib64/cmake/AppStreamQt/AppStreamQtConfigVersion.cmake

OBS-URL: https://build.opensuse.org/request/show/1157299
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/AppStream?expand=0&rev=118
---
 AppStream.changes | 7 +++++++
 AppStream.spec    | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/AppStream.changes b/AppStream.changes
index 7a9099d..937497a 100644
--- a/AppStream.changes
+++ b/AppStream.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 12 16:47:37 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
+
+- Add conflict in appstream-qt6-devel with
+  libAppStreamQt-devel < 1.0. This is required to fix a file
+  conflict in SLE with the old libAppStreamQt-devel package.
+
 -------------------------------------------------------------------
 Fri Mar  1 09:46:46 UTC 2024 - Christophe Marin <christophe@krop.fr>
 
diff --git a/AppStream.spec b/AppStream.spec
index c34585c..f950ff6 100644
--- a/AppStream.spec
+++ b/AppStream.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package AppStream
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%flavor" == "qt6"
 %define pkg_suffix -qt6
@@ -98,12 +99,14 @@ Summary:        Header files for AppStream's Qt 6 bindings
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Requires:       libAppStreamQt%{libAppStreamQt_sover} = %{version}
 Requires:       libappstream%{libappstream_sover} = %{version}
+Conflicts:      libAppStreamQt-devel < 1.0
 
 %description -n appstream-qt6-devel
 This package contains all necessary include files, libraries,
 configuration files and development tools (with manual pages) needed to
 compile and link applications using the Qt bindings for AppStream.
 %else
+
 %package -n libappstream%{libappstream_sover}
 Summary:        The main library for AppStream
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -267,6 +270,7 @@ rm -r %{buildroot}%{_libdir}/pkgconfig
 %{_libdir}/libAppStreamQt.so
 
 %else
+
 %files lang -f %{name}.lang
 
 %files