From 5bbd5601efc77e0169c8a3a4a32ee7e0f8d2f91a0ad28f389e9c88b7756fb2c3 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Mon, 22 Jan 2024 09:48:52 +0000
Subject: [PATCH] Accepting request 1140321 from home:Vogtinator:other6

- Bump version to 1.4
- qml.req:
  * Detect Qt version based on libQtCore presence. The previous method
    broke if /usr/libexec/qtX or kf5-filesystem were present.
- qmldirreqprov.sh:
  * Generate unversioned URI provides for plugin provided imports as well

OBS-URL: https://build.opensuse.org/request/show/1140321
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/qml-autoreqprov?expand=0&rev=13
---
 qml-autoreqprov.changes | 10 ++++++++++
 qml-autoreqprov.spec    |  4 ++--
 qml.req                 |  4 +++-
 qmldirreqprov.sh        |  1 +
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/qml-autoreqprov.changes b/qml-autoreqprov.changes
index 5c02892..98d6f7d 100644
--- a/qml-autoreqprov.changes
+++ b/qml-autoreqprov.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Jan 21 12:11:19 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Bump version to 1.4
+- qml.req:
+  * Detect Qt version based on libQtCore presence. The previous method
+    broke if /usr/libexec/qtX or kf5-filesystem were present.
+- qmldirreqprov.sh:
+  * Generate unversioned URI provides for plugin provided imports as well
+
 -------------------------------------------------------------------
 Tue Nov 14 23:57:17 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/qml-autoreqprov.spec b/qml-autoreqprov.spec
index ead8c86..0488253 100644
--- a/qml-autoreqprov.spec
+++ b/qml-autoreqprov.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package qml-autoreqprov
 #
-# 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
@@ -17,7 +17,7 @@
 
 
 Name:           qml-autoreqprov
-Version:        1.3
+Version:        1.4
 Release:        0
 Summary:        Automatic dependency generator for QML files and modules
 License:        GPL-3.0-or-later
diff --git a/qml.req b/qml.req
index 9391769..a2055ed 100644
--- a/qml.req
+++ b/qml.req
@@ -25,7 +25,9 @@ qtver=
 [[ -n ${qtvers} ]] || qtvers="5 6 7"
 
 for ver in ${qtvers}; do
-	stat /usr/lib*/qt${ver} &>/dev/null && qtver="${qtver}${ver}"
+	if [ -e "/usr/lib/libQt${ver}Core.so.${ver}" ] || [ -e "/usr/lib64/libQt${ver}Core.so.${ver}" ]; then
+		qtver="${qtver}${ver}"
+	fi
 done
 
 # Zero or more than one version of Qt found. Abort.
diff --git a/qmldirreqprov.sh b/qmldirreqprov.sh
index d8917b5..b996564 100644
--- a/qmldirreqprov.sh
+++ b/qmldirreqprov.sh
@@ -101,6 +101,7 @@ while read file; do
 					echo "Ignoring ${import}" >&2
 					continue
 				fi
+				moduleExports["qt${qtver}qmlimport(${import%.*})"]="" # Provides for unversioned imports
 				foundModuleExport "qt${qtver}qmlimport(${import})" "$min"
 			done < <(qmlpluginexports-qt${qtver} "$plugin" "$module")
 		done