1.0.0-10

backport crash fix recommended by upstream
cleanup macros
simplify %files
BR: bison flex (enables Survey targeting expressions support)
drop BR: qt5-qtbase-private-devel (no private api use detected)
drop non-autodetected runtime deps

0077-opengl-source-Do-not-crash-if-we-could-not-make-our-.patch

@@ -0,0 +1,39 @@
+From 17db7d75643b4f3dccd5b36a6ab175f03ba74297 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Wed, 2 Feb 2022 20:36:40 +0100
+Subject: [PATCH 77/77] opengl source: Do not crash if we could not make our
+ context current
+
+BUG: 449505
+---
+ src/provider/core/openglinfosource.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/provider/core/openglinfosource.cpp b/src/provider/core/openglinfosource.cpp
+index 5117d85..08402c7 100644
+--- a/src/provider/core/openglinfosource.cpp
++++ b/src/provider/core/openglinfosource.cpp
+@@ -13,6 +13,7 @@
+ #include <QOpenGLFunctions>
+ #include <QSurfaceFormat>
+ #include <QWindow>
++#include "logging_p.h"
+ #endif
+ 
+ using namespace KUserFeedback;
+@@ -37,7 +38,11 @@ QVariant OpenGLInfoSource::data()
+         QWindow window;
+         window.setSurfaceType(QSurface::OpenGLSurface);
+         window.create();
+-        context.makeCurrent(&window);
++        if (!context.makeCurrent(&window)) {
++            qCWarning(Log) << "Could not make OpenGL context current";
++            m.insert(QStringLiteral("type"), QStringLiteral("none"));
++            return m;
++        }
+         QOpenGLFunctions functions(&context);
+         m.insert(QStringLiteral("vendor"), OpenGLInfoSourcePrivate::normalizeVendor(reinterpret_cast<const char*>(functions.glGetString(GL_VENDOR))));
+         m.insert(QStringLiteral("renderer"), OpenGLInfoSourcePrivate::normalizeRenderer(reinterpret_cast<const char*>(functions.glGetString(GL_RENDERER))));
+-- 
+2.34.1
+

kuserfeedback.spec

@@ -1,13 +1,18 @@
-%undefine __cmake_in_source_build
 Name:    kuserfeedback
 Summary: Framework for collecting user feedback for apps via telemetry and surveys
 Version: 1.0.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 
 License: MIT
 URL:     https://invent.kde.org/libraries/%{name}
 Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz
 
+## upstream patches
+# git clone https://invent.kde.org/libraries/kuserfeedback.git
+# cd kuserfeedback
+# git format-patch v1.0.0
+Patch77: 0077-opengl-source-Do-not-crash-if-we-could-not-make-our-.patch
+
 BuildRequires: cmake
 BuildRequires: gcc-c++
 
@@ -24,24 +29,17 @@ BuildRequires: cmake(Qt5Network)
 BuildRequires: cmake(Qt5Widgets)
 BuildRequires: cmake(Qt5PrintSupport)
 
-## uses Qt5 private api's these help track that
+BuildRequires: bison
-BuildRequires: qt5-qtbase-private-devel
+BuildRequires: flex
-%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-
-Requires:      qt5-qtbase
-Requires:      qt5-qtdeclarative
-Requires:      kf5-kdeclarative
 
 %description
 %{summary}.
 
 %package        devel
 Summary:        Development files for %{name}
-License:        MIT
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       qt5-qtbase
 Requires:       qt5-qtbase-devel
-Requires:       cmake-filesystem
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -49,7 +47,6 @@ developing applications that use %{name}.
 
 %package        console
 Summary:        Analytics and administration tool for UserFeedback servers
-License:        MIT
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    console
@@ -58,18 +55,20 @@ Analytics and administration tool for UserFeedback servers.
 
 %prep
 %autosetup -p1
-mkdir %{_target_platform}
 
 
 %build
-%{cmake_kf5} -DENABLE_DOCS:BOOL=OFF
+%cmake_kf5 \
+   -DENABLE_DOCS:BOOL=OFF
+
 %cmake_build
 
 
 %install
 %cmake_install
-%{find_lang} userfeedbackconsole5 --with-qt
+
-%{find_lang} userfeedbackprovider5 --with-qt
+%find_lang userfeedbackconsole5 --with-qt
+%find_lang userfeedbackprovider5 --with-qt
 
 
 %check
@@ -83,17 +82,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/UserFeedbackConsole.d
 %{_bindir}/userfeedbackctl
 %{_libdir}/libKUserFeedbackCore.so.1*
 %{_libdir}/libKUserFeedbackWidgets.so.1*
-%dir %{_kf5_qmldir}/org/kde/userfeedback
+%{_kf5_qmldir}/org/kde/userfeedback/
-%{_kf5_qmldir}/org/kde/userfeedback/qmldir
-%{_kf5_qmldir}/org/kde/userfeedback/libKUserFeedbackQml.so
 
 
 %files devel
 %{_includedir}/KUserFeedback/
 %{_libdir}/libKUserFeedbackCore.so
 %{_libdir}/libKUserFeedbackWidgets.so
-%dir %{_kf5_libdir}/cmake/KUserFeedback
+%{_kf5_libdir}/cmake/KUserFeedback/
-%{_kf5_libdir}/cmake/KUserFeedback/KUserFeedback*.cmake
 %{_kf5_archdatadir}/mkspecs/modules/qt_KUserFeedback*.pri
 
 
@@ -103,6 +99,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/UserFeedbackConsole.d
 
 
 %changelog
+* Thu Feb 03 2022 Rex Dieter <rdieter@fedoraproject.org> - 1.0.0-10
+- backport crash fix recommended by upstream
+- cleanup macros
+- simplify %%files
+- BR: bison flex (enables Survey targeting expressions support)
+- drop BR: qt5-qtbase-private-devel (no private api use detected)
+- drop non-autodetected runtime deps
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild