From 100db845c7f0e48d872bd8b2cfa45d3e6490456e3459e211b607968f02dc5eeb Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Thu, 30 Apr 2020 14:31:05 +0000
Subject: [PATCH] Accepting request 799273 from home:dimstar:Factory

- Split out data files from libfm-qt7 in order to adhere to the
  shared library packaging policy.

OBS-URL: https://build.opensuse.org/request/show/799273
OBS-URL: https://build.opensuse.org/package/show/X11:LXQt/libfm-qt?expand=0&rev=23
---
 libfm-qt.changes |  6 ++++++
 libfm-qt.spec    | 25 ++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/libfm-qt.changes b/libfm-qt.changes
index df025a4..58a15ae 100644
--- a/libfm-qt.changes
+++ b/libfm-qt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr 30 14:25:16 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Split out data files from libfm-qt7 in order to adhere to the
+  shared library packaging policy.
+
 -------------------------------------------------------------------
 Mon Apr 27 18:16:53 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 
diff --git a/libfm-qt.spec b/libfm-qt.spec
index 66fe796..401ad6d 100644
--- a/libfm-qt.spec
+++ b/libfm-qt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libfm-qt
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -54,7 +54,9 @@ build desktop file managers.
 
 %package -n libfm-qt7
 Summary:        Library providing components to build desktop file managers
+# Require data files read by the library. For parallel installed library versions, the newest one wins
 Group:          System/Libraries
+Requires:       %{name}-data >= %{version}
 Recommends:     %{name}-lang
 Conflicts:      pcmanfm <= 0.10.0
 
@@ -62,6 +64,17 @@ Conflicts:      pcmanfm <= 0.10.0
 libfm-qt is the Qt port of libfm, a library providing components to
 build desktop file managers.
 
+%package data
+Summary:        Data files for libfm library
+# libfm-qt6 wrongly shipped those files as part of the library package
+# resulting in file conflicts when the soname changed
+# No way to fix the old package, so we conflict it
+Group:          Development/Libraries/C and C++
+Conflicts:      libfm-qt6
+
+%description data
+Provides data to be read by libfm-qt
+
 %package -n libfm-qt-devel
 Summary:        Development files for libfm-qt
 Group:          Development/Libraries/C and C++
@@ -78,7 +91,7 @@ Libfm-Qt libraries for development
 
 %build
 %cmake -DPULL_TRANSLATIONS=No
-make %{?_smp_mflags}
+%make_build
 
 %install
 %cmake_install
@@ -91,8 +104,10 @@ make %{?_smp_mflags}
 %files -n libfm-qt7
 %license LICENSE.BSD-3-Clause
 %doc README.md
-%dir %{_datadir}/libfm-qt/
 %{_libdir}/libfm-qt.so.*
+
+%files data
+%dir %{_datadir}/libfm-qt/
 %{_datadir}/libfm-qt/archivers.list
 %{_datadir}/libfm-qt/terminals.list
 %{_datadir}/mime/packages/libfm-qt-mimetypes.xml
@@ -107,7 +122,7 @@ make %{?_smp_mflags}
 %{_datadir}/cmake/fm-qt/fm-qt-targets-*.cmake
 %{_datadir}/cmake/fm-qt/fm-qt-targets.cmake
 
-%files lang -f %{name}.lang 
+%files lang -f %{name}.lang
 %dir %{_datadir}/libfm-qt
 %dir %{_datadir}/libfm-qt/translations
 %{_datadir}/libfm-qt/translations/*