diff --git a/kuserfeedback.spec b/kuserfeedback.spec index 89ee825..2bca2f8 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -1,19 +1,17 @@ +%undefine __cmake_in_source_build Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.0.0 +Release: 8%{?dist} License: MIT URL: https://invent.kde.org/libraries/%{name} Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz -## upstream patches - BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: kf5-rpm-macros -BuildRequires: libappstream-glib BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules @@ -26,17 +24,24 @@ BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: bison -BuildRequires: flex +## uses Qt5 private api's these help track that +BuildRequires: qt5-qtbase-private-devel +%{?_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: cmake(Qt5Network) -Requires: cmake(Qt5Widgets) +Requires: qt5-qtbase +Requires: qt5-qtbase-devel +Requires: cmake-filesystem %description devel The %{name}-devel package contains libraries and header files for @@ -44,11 +49,8 @@ developing applications that use %{name}. %package console Summary: Analytics and administration tool for UserFeedback servers +License: MIT Requires: %{name}%{?_isa} = %{version}-%{release} -## uses qt5-qtcharts private api's these help track that -## (unfortunately, there is no qt5-qtcharts-private-devel) -BuildRequires: qt5-qtbase-private-devel -Requires: qt5-qtcharts%{?_isa} = %{_qt5_version} %description console Analytics and administration tool for UserFeedback servers. @@ -56,73 +58,51 @@ 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 -appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.kuserfeedback-console.appdata.xml -desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kuserfeedback-console.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/UserFeedbackConsole.desktop %files -f userfeedbackprovider5.lang %doc README.md %license COPYING.LIB +%{_sysconfdir}/xdg/org_kde_UserFeedback.categories %{_bindir}/userfeedbackctl %{_libdir}/libKUserFeedbackCore.so.1* %{_libdir}/libKUserFeedbackWidgets.so.1* -%{_kf5_qmldir}/org/kde/userfeedback/ -%{_kf5_datadir}/qlogging-categories5/org_kde_UserFeedback.categories +%dir %{_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 -%{_kf5_libdir}/cmake/KUserFeedback/ +%dir %{_kf5_libdir}/cmake/KUserFeedback +%{_kf5_libdir}/cmake/KUserFeedback/KUserFeedback*.cmake %{_kf5_archdatadir}/mkspecs/modules/qt_KUserFeedback*.pri %files console -f userfeedbackconsole5.lang %{_bindir}/UserFeedbackConsole -%{_datadir}/applications/org.kde.kuserfeedback-console.desktop -%{_kf5_metainfodir}/org.kde.kuserfeedback-console.appdata.xml +%{_datadir}/applications/UserFeedbackConsole.desktop %changelog -* Tue Mar 08 2022 Jan Grulich - 1.2.0-2 -- Rebuild (qt5) - -* Fri Feb 04 2022 Yaroslav Sidlovsky - 1.2.0-1 -- update to 1.2.0 - -* Fri Feb 04 2022 Rex Dieter - 1.0.0-11 -- -console: uses qt5-qtcharts private api -- -devel: use cmake-style deps instead of hard-coding qt5-qtbase - -* Thu Feb 03 2022 Rex Dieter - 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 - 1.0.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Thu Jul 22 2021 Fedora Release Engineering - 1.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 28749c3..269e021 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kuserfeedback-1.2.0.tar.xz) = 0152233c741a287b623256cac6d109d405441f17dec68c5782d900ddb9ca5a93614d46ea112e1be9e64913cc3f46d107bec64cad4579b766919439b0ed88a470 +SHA512 (kuserfeedback-1.0.0.tar.xz) = d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7