From d655c4972e94e851587360b8ca0c4a2540d8967a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 13 Jul 2019 11:54:10 -0500 Subject: [PATCH 01/14] 5.60.0 BR: qt5 >= 5.11 --- kf5.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index 6d6cd6e..6c6a931 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.59.0 +Version: 5.60.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -22,10 +22,10 @@ Filesystem for KDE Frameworks 5. Summary: RPM macros for KDE Frameworks 5 %if 0%{?fedora} || 0%{?rhel} > 7 Requires: cmake >= 3 -Requires: qt5-rpm-macros >= 5.10 +Requires: qt5-rpm-macros >= 5.11 %else Requires: cmake3 -Requires: qt5-qtbase-devel >= 5.10 +Requires: qt5-qtbase-devel >= 5.11 %endif # misc build environment dependencies Requires: gcc-c++ @@ -73,6 +73,10 @@ sed -i \ %changelog +* Sat Jul 13 2019 Rex Dieter - 5.60.0-1 +- 5.60.0 +- BR: qt5 >= 5.11 + * Thu Jun 06 2019 Rex Dieter - 5.59.0-1 - 5.59.0 From 2eeb5b3704ba8e4becea5c442976ca7083618b39 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 11:24:44 +0000 Subject: [PATCH 02/14] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 6c6a931..c712302 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.60.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -73,6 +73,9 @@ sed -i \ %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 5.60.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Jul 13 2019 Rex Dieter - 5.60.0-1 - 5.60.0 - BR: qt5 >= 5.11 From 95af6f2a4e48d9e3b461f838d73533526931725c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 29 Jul 2019 08:19:14 -0500 Subject: [PATCH 03/14] -filesystem: ++/usr/share/qlogging-categories5/ --- kf5.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index c712302..fac1ebc 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.60.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -42,6 +42,7 @@ mkdir -p %{buildroot}%{_includedir}/KF5 mkdir -p %{buildroot}%{_datadir}/{config.kcfg,kconf_update,kf5,kservicetypes5} mkdir -p %{buildroot}%{_datadir}/kpackage/{genericqml,kcms} mkdir -p %{buildroot}%{_datadir}/kservices5/ServiceMenus +mkdir -p %{buildroot}%{_datadir}/qlogging-categories5/ mkdir -p %{buildroot}%{_datadir}/solid/{actions,devices} mkdir -p %{buildroot}%{_libexecdir}/kf5 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown} @@ -66,6 +67,7 @@ sed -i \ %{_datadir}/kpackage/ %{_datadir}/kservices5/ %{_datadir}/kservicetypes5/ +%{_datadir}/qlogging-categories5/ %{_datadir}/solid/ %files rpm-macros @@ -73,6 +75,9 @@ sed -i \ %changelog +* Mon Jul 29 2019 Rex Dieter - 5.60.0-3 +- -filesystem: ++%{_kf5_datadir}/qlogging-categories5/ + * Thu Jul 25 2019 Fedora Release Engineering - 5.60.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 21d91a3ce00ec3bc0c433212eae86dd32e4921af Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 7 Aug 2019 09:45:39 -0500 Subject: [PATCH 04/14] 5.61.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index fac1ebc..f28be7a 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.60.0 -Release: 3%{?dist} +Version: 5.61.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -75,6 +75,9 @@ sed -i \ %changelog +* Wed Aug 07 2019 Rex Dieter - 5.61.0-1 +- 5.61.0 + * Mon Jul 29 2019 Rex Dieter - 5.60.0-3 - -filesystem: ++%{_kf5_datadir}/qlogging-categories5/ From cd1d8c89e34715a33ef41b30ddf0e88af71613d1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 16 Sep 2019 16:22:43 -0500 Subject: [PATCH 05/14] 5.62.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index f28be7a..5689a78 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.61.0 +Version: 5.62.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -75,6 +75,9 @@ sed -i \ %changelog +* Mon Sep 16 2019 Rex Dieter - 5.62.0-1 +- 5.62.0 + * Wed Aug 07 2019 Rex Dieter - 5.61.0-1 - 5.61.0 From b25771ea875a97144a04cc6af04baf3d659b38b6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 19 Oct 2019 17:01:10 -0500 Subject: [PATCH 06/14] -filesystem: ++/usr/share/knsrcfiles/ --- kf5.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 5689a78..cf09f7d 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.62.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -42,6 +42,7 @@ mkdir -p %{buildroot}%{_includedir}/KF5 mkdir -p %{buildroot}%{_datadir}/{config.kcfg,kconf_update,kf5,kservicetypes5} mkdir -p %{buildroot}%{_datadir}/kpackage/{genericqml,kcms} mkdir -p %{buildroot}%{_datadir}/kservices5/ServiceMenus +mkdir -p %{buildroot}%{_datadir}/knsrcfiles/ mkdir -p %{buildroot}%{_datadir}/qlogging-categories5/ mkdir -p %{buildroot}%{_datadir}/solid/{actions,devices} mkdir -p %{buildroot}%{_libexecdir}/kf5 @@ -67,6 +68,7 @@ sed -i \ %{_datadir}/kpackage/ %{_datadir}/kservices5/ %{_datadir}/kservicetypes5/ +%{_datadir}/knsrcfiles/ %{_datadir}/qlogging-categories5/ %{_datadir}/solid/ @@ -75,6 +77,9 @@ sed -i \ %changelog +* Sat Oct 19 2019 Rex Dieter - 5.62.0-2 +- -filesystem: ++%{_kf5_datadir}/knsrcfiles/ + * Mon Sep 16 2019 Rex Dieter - 5.62.0-1 - 5.62.0 From 3d77bd20571045b1b8adf8144cf5514d50036e65 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 22 Oct 2019 08:16:49 -0500 Subject: [PATCH 07/14] 5.63 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index cf09f7d..8ef3800 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.62.0 -Release: 2%{?dist} +Version: 5.63.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -77,6 +77,9 @@ sed -i \ %changelog +* Tue Oct 22 2019 Rex Dieter - 5.63.0-1 +- 5.63 + * Sat Oct 19 2019 Rex Dieter - 5.62.0-2 - -filesystem: ++%{_kf5_datadir}/knsrcfiles/ From 6dee37f21fff26df89f3f47adc5f5031099f5f69 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Nov 2019 10:02:57 -0600 Subject: [PATCH 08/14] 5.64 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 8ef3800..7b89b17 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.63.0 +Version: 5.64.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -77,6 +77,9 @@ sed -i \ %changelog +* Fri Nov 08 2019 Rex Dieter - 5.64.0-1 +- 5.64 + * Tue Oct 22 2019 Rex Dieter - 5.63.0-1 - 5.63 From 1c7c40b3d5361a8883701ec556f8f3206028c55d Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 11 Dec 2019 12:42:48 -0800 Subject: [PATCH 09/14] rhel8 does not use cmake3, just cmake --- kf5.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 7b89b17..310c4e9 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.64.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -51,6 +51,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown} install -Dpm644 %{_sourcedir}/macros.kf5 %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 sed -i \ -e "s|@@KF5_VERSION@@|%{version}|g" \ +%if 0%{?rhel} || 0%{?rhel} > 7 + -e 's|rhel:%{__cmake3}|rhel:%{__cmake}|' \ +%endif %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 @@ -77,6 +80,9 @@ sed -i \ %changelog +* Wed Dec 11 2019 Troy Dawson - 5.64.0-2 +- rhel8 doesn't need cmake3, just cmake + * Fri Nov 08 2019 Rex Dieter - 5.64.0-1 - 5.64 From 55866fcb6db5dd3c8dc124dc2ccb46dba9bb0880 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 17 Dec 2019 10:56:34 -0600 Subject: [PATCH 10/14] 5.65 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 310c4e9..90c07b6 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.64.0 -Release: 2%{?dist} +Version: 5.65.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -80,6 +80,9 @@ sed -i \ %changelog +* Tue Dec 17 2019 Rex Dieter - 5.65.0-1 +- 5.65 + * Wed Dec 11 2019 Troy Dawson - 5.64.0-2 - rhel8 doesn't need cmake3, just cmake From 329980b00b51eddf19e1c70a0e4d5f187db30747 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 Jan 2020 13:52:04 -0600 Subject: [PATCH 11/14] 5.66 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 90c07b6..d3b481a 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.65.0 +Version: 5.66.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,6 +80,9 @@ sed -i \ %changelog +* Tue Jan 07 2020 Rex Dieter - 5.66.0-1 +- 5.66 + * Tue Dec 17 2019 Rex Dieter - 5.65.0-1 - 5.65 From 41b646d6cbd7385c41d2b3c3b10730ce970d767b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 07:02:00 +0000 Subject: [PATCH 12/14] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index d3b481a..7df2ce5 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.66.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -80,6 +80,9 @@ sed -i \ %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 5.66.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Jan 07 2020 Rex Dieter - 5.66.0-1 - 5.66 From a543aa1105c2f434f68b12737644fc77a512eed3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 2 Feb 2020 17:38:12 -0600 Subject: [PATCH 13/14] 5.67 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 7df2ce5..61a93bf 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.66.0 -Release: 2%{?dist} +Version: 5.67.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -80,6 +80,9 @@ sed -i \ %changelog +* Sun Feb 02 2020 Rex Dieter - 5.67.0-1 +- 5.67 + * Wed Jan 29 2020 Fedora Release Engineering - 5.66.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f84016d4886060e83d81f9ffe2500aad23380376 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Mar 2020 21:47:06 -0500 Subject: [PATCH 14/14] 5.68 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 61a93bf..fcb02b7 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.67.0 +Version: 5.68.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,6 +80,9 @@ sed -i \ %changelog +* Thu Mar 19 2020 Rex Dieter - 5.68.0-1 +- 5.68 + * Sun Feb 02 2020 Rex Dieter - 5.67.0-1 - 5.67