From 9879199c6a5cc37b18cc99ab381ed29018b1d4f0 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 8 Mar 2022 08:53:06 +0100 Subject: [PATCH 01/10] Rebuild (qt5) --- kuserfeedback.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kuserfeedback.spec b/kuserfeedback.spec index 65454f3..89ee825 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -1,7 +1,7 @@ Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: https://invent.kde.org/libraries/%{name} @@ -102,6 +102,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kuserfeedback %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 From 0e2357873fd40280416f48683e69efb1d74b08fe Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 26 Apr 2022 09:19:38 -0700 Subject: [PATCH 02/10] Revert back --- kuserfeedback.spec | 74 +++++++++++++++++----------------------------- sources | 2 +- 2 files changed, 28 insertions(+), 48 deletions(-) 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 From 4900632eecc84e59aa7f8f504f2e2e2280946f22 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 26 Apr 2022 09:21:05 -0700 Subject: [PATCH 03/10] Rebuild for qt5-5.15.3 --- kuserfeedback.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kuserfeedback.spec b/kuserfeedback.spec index 2bca2f8..65fa4ed 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -2,7 +2,7 @@ Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys Version: 1.0.0 -Release: 8%{?dist} +Release: 9%{?dist} License: MIT URL: https://invent.kde.org/libraries/%{name} @@ -103,6 +103,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/UserFeedbackConsole.d %changelog +* Tue Apr 26 2022 Troy Dawson - 1.0.0-9 +- Rebuild for qt5-5.15.3 + * Thu Jul 22 2021 Fedora Release Engineering - 1.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e88a21f4910ae87f3a80881664949bef1ad82afe Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 26 Apr 2022 09:45:00 -0700 Subject: [PATCH 04/10] Revert "Rebuild for qt5-5.15.3" This reverts commit 4900632eecc84e59aa7f8f504f2e2e2280946f22. --- kuserfeedback.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kuserfeedback.spec b/kuserfeedback.spec index 65fa4ed..2bca2f8 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -2,7 +2,7 @@ Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys Version: 1.0.0 -Release: 9%{?dist} +Release: 8%{?dist} License: MIT URL: https://invent.kde.org/libraries/%{name} @@ -103,9 +103,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/UserFeedbackConsole.d %changelog -* Tue Apr 26 2022 Troy Dawson - 1.0.0-9 -- Rebuild for qt5-5.15.3 - * Thu Jul 22 2021 Fedora Release Engineering - 1.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 3dabf9aa41d85e828e33ebb2a5d6ce466515f443 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 26 Apr 2022 09:45:05 -0700 Subject: [PATCH 05/10] Revert "Revert back" This reverts commit 0e2357873fd40280416f48683e69efb1d74b08fe. --- kuserfeedback.spec | 74 +++++++++++++++++++++++++++++----------------- sources | 2 +- 2 files changed, 48 insertions(+), 28 deletions(-) diff --git a/kuserfeedback.spec b/kuserfeedback.spec index 2bca2f8..89ee825 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -1,17 +1,19 @@ -%undefine __cmake_in_source_build Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys -Version: 1.0.0 -Release: 8%{?dist} +Version: 1.2.0 +Release: 2%{?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 @@ -24,24 +26,17 @@ BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5PrintSupport) -## 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 +BuildRequires: bison +BuildRequires: flex %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 +Requires: cmake(Qt5Network) +Requires: cmake(Qt5Widgets) %description devel The %{name}-devel package contains libraries and header files for @@ -49,8 +44,11 @@ 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. @@ -58,51 +56,73 @@ 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 -desktop-file-validate %{buildroot}%{_datadir}/applications/UserFeedbackConsole.desktop +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 %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* -%dir %{_kf5_qmldir}/org/kde/userfeedback -%{_kf5_qmldir}/org/kde/userfeedback/qmldir -%{_kf5_qmldir}/org/kde/userfeedback/libKUserFeedbackQml.so +%{_kf5_qmldir}/org/kde/userfeedback/ +%{_kf5_datadir}/qlogging-categories5/org_kde_UserFeedback.categories %files devel %{_includedir}/KUserFeedback/ %{_libdir}/libKUserFeedbackCore.so %{_libdir}/libKUserFeedbackWidgets.so -%dir %{_kf5_libdir}/cmake/KUserFeedback -%{_kf5_libdir}/cmake/KUserFeedback/KUserFeedback*.cmake +%{_kf5_libdir}/cmake/KUserFeedback/ %{_kf5_archdatadir}/mkspecs/modules/qt_KUserFeedback*.pri %files console -f userfeedbackconsole5.lang %{_bindir}/UserFeedbackConsole -%{_datadir}/applications/UserFeedbackConsole.desktop +%{_datadir}/applications/org.kde.kuserfeedback-console.desktop +%{_kf5_metainfodir}/org.kde.kuserfeedback-console.appdata.xml %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 269e021..28749c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kuserfeedback-1.0.0.tar.xz) = d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7 +SHA512 (kuserfeedback-1.2.0.tar.xz) = 0152233c741a287b623256cac6d109d405441f17dec68c5782d900ddb9ca5a93614d46ea112e1be9e64913cc3f46d107bec64cad4579b766919439b0ed88a470 From a92f16e466585322fab9182364d7ab0ff47eac1a Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 17 May 2022 13:04:22 +0200 Subject: [PATCH 06/10] Rebuild (qt5) --- kuserfeedback.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kuserfeedback.spec b/kuserfeedback.spec index 89ee825..197cb65 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -1,7 +1,7 @@ Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys Version: 1.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://invent.kde.org/libraries/%{name} @@ -102,6 +102,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kuserfeedback %changelog +* Tue May 17 2022 Jan Grulich - 1.2.0-3 +- Rebuild (qt5) + * Tue Mar 08 2022 Jan Grulich - 1.2.0-2 - Rebuild (qt5) From c59eed012863ace6ca115f440ad3b4147dccefd6 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 14 Jul 2022 15:03:24 +0200 Subject: [PATCH 07/10] Rebuild (qt5) --- kuserfeedback.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kuserfeedback.spec b/kuserfeedback.spec index 197cb65..5ee9ce4 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -1,7 +1,7 @@ Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys Version: 1.2.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: https://invent.kde.org/libraries/%{name} @@ -102,6 +102,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kuserfeedback %changelog +* Thu Jul 14 2022 Jan Grulich - 1.2.0-4 +- Rebuild (qt5) + * Tue May 17 2022 Jan Grulich - 1.2.0-3 - Rebuild (qt5) From 646f4e5926a9200a691d55f8c27ee8eb2aac6570 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 16:47:13 +0000 Subject: [PATCH 08/10] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kuserfeedback.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kuserfeedback.spec b/kuserfeedback.spec index 5ee9ce4..56b3d18 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -1,7 +1,7 @@ Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys Version: 1.2.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT URL: https://invent.kde.org/libraries/%{name} @@ -102,6 +102,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kuserfeedback %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.2.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jul 14 2022 Jan Grulich - 1.2.0-4 - Rebuild (qt5) From c2e92350e4bd15dadf24559a0d94ec3f488a6ef4 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 23 Sep 2022 15:24:53 +0200 Subject: [PATCH 09/10] Drop hardcoded Qt version requirement --- kuserfeedback.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kuserfeedback.spec b/kuserfeedback.spec index 56b3d18..e6f54ae 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -1,7 +1,7 @@ Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys Version: 1.2.0 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT URL: https://invent.kde.org/libraries/%{name} @@ -45,10 +45,7 @@ developing applications that use %{name}. %package console Summary: Analytics and administration tool for UserFeedback servers 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. @@ -102,6 +99,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kuserfeedback %changelog +* Fri Sep 23 2022 Jan Grulich - 1.2.0-6 +- Drop hardcoded Qt version requirement + * Thu Jul 21 2022 Fedora Release Engineering - 1.2.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From bbe1f1eecd5a5f24cdfde8c8964eb6c9a1b9995b Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 23 Sep 2022 17:50:09 +0200 Subject: [PATCH 10/10] Bring back dependency on qt5-qtcharts --- kuserfeedback.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kuserfeedback.spec b/kuserfeedback.spec index e6f54ae..cf3acf7 100644 --- a/kuserfeedback.spec +++ b/kuserfeedback.spec @@ -1,7 +1,7 @@ Name: kuserfeedback Summary: Framework for collecting user feedback for apps via telemetry and surveys Version: 1.2.0 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT URL: https://invent.kde.org/libraries/%{name} @@ -46,6 +46,7 @@ developing applications that use %{name}. Summary: Analytics and administration tool for UserFeedback servers Requires: %{name}%{?_isa} = %{version}-%{release} BuildRequires: qt5-qtbase-private-devel +Requires: qt5-qtcharts%{?_isa} %description console Analytics and administration tool for UserFeedback servers. @@ -99,6 +100,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kuserfeedback %changelog +* Fri Sep 23 2022 Jan Grulich - 1.2.0-7 +- Bring back dependency on qt5-qtcharts + * Fri Sep 23 2022 Jan Grulich - 1.2.0-6 - Drop hardcoded Qt version requirement