From de356c8bb3c32fc3d46c7c3cf97330013d7f9f7a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 21 Apr 2020 12:14:24 -0500 Subject: [PATCH 01/28] 5.69.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index fcb02b7..b0918ff 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.68.0 +Version: 5.69.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,6 +80,9 @@ sed -i \ %changelog +* Tue Apr 21 2020 Rex Dieter - 5.69.0-1 +- 5.69.0 + * Thu Mar 19 2020 Rex Dieter - 5.68.0-1 - 5.68 From 1ce181fdda63057ad267fdfee40df6c823929e8d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 May 2020 16:39:27 -0500 Subject: [PATCH 02/28] 5.70.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index b0918ff..cfb2fa5 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.69.0 +Version: 5.70.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,6 +80,9 @@ sed -i \ %changelog +* Mon May 04 2020 Rex Dieter - 5.70.0-1 +- 5.70.0 + * Tue Apr 21 2020 Rex Dieter - 5.69.0-1 - 5.69.0 From 5a0f6799281cff016ffd247a66afc4e9e84be537 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 16 Jun 2020 09:08:55 -0500 Subject: [PATCH 03/28] 5.71.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index cfb2fa5..d8a6f9d 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.70.0 +Version: 5.71.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -80,6 +80,9 @@ sed -i \ %changelog +* Tue Jun 16 2020 Rex Dieter - 5.71.0-1 +- 5.71.0 + * Mon May 04 2020 Rex Dieter - 5.70.0-1 - 5.70.0 From 87be26566bd39aeb1a1d77dff08788c4a01250a4 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 3 Jul 2020 14:13:13 -0400 Subject: [PATCH 04/28] Support automatically doing out of tree builds if cmake is configured as such --- kf5.spec | 5 ++++- macros.kf5 | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index d8a6f9d..159b6e6 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.71.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 +* Fri Jul 03 2020 Neal Gompa - 5.71.0-2 +- Support automatically doing out of tree builds if cmake is configured as such + * Tue Jun 16 2020 Rex Dieter - 5.71.0-1 - 5.71.0 diff --git a/macros.kf5 b/macros.kf5 index b4975ff..3104569 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -23,6 +23,8 @@ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ %{?fedora:%{__cmake}}%{?rhel:%{__cmake3}} \\\ + %{?__cmake_builddir:-S "%{_vpath_srcdir}"} \\\ + %{?__cmake_builddir:-B "%{__cmake_builddir}"} \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ From e3b6a4f15de61369a24483fc19cad38f1518ee6b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 7 Jul 2020 10:39:37 -0500 Subject: [PATCH 05/28] 5.72.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 159b6e6..562592a 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.71.0 -Release: 2%{?dist} +Version: 5.72.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 Jul 07 2020 Rex Dieter - 5.72.0-1 +- 5.72.0 + * Fri Jul 03 2020 Neal Gompa - 5.71.0-2 - Support automatically doing out of tree builds if cmake is configured as such From 730bbb4a64037766d0fa4c8a5860187960892592 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 10 Jul 2020 15:43:16 -0700 Subject: [PATCH 06/28] tweak rhel8+ cmake statement --- kf5.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 562592a..2ef525f 100644 --- a/kf5.spec +++ b/kf5.spec @@ -51,8 +51,8 @@ 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}|' \ +%if 0%{?rhel} && 0%{?rhel} > 7 + -e 's|%{?fedora:%{__cmake}}%{?rhel:%{__cmake3}}| %{__cmake}|' \ %endif %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 From 6d882351c9fbf0f917195169128c3ee3698680be Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 14 Jul 2020 14:43:16 -0700 Subject: [PATCH 07/28] clean up cmake macro diffs --- kf5.spec | 4 ++-- macros.kf5 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kf5.spec b/kf5.spec index 2ef525f..cd745bc 100644 --- a/kf5.spec +++ b/kf5.spec @@ -51,8 +51,8 @@ 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|%{?fedora:%{__cmake}}%{?rhel:%{__cmake3}}| %{__cmake}|' \ +%if 0%{?rhel} && 0%{?rhel} < 8 + -e 's|%{__cmake}|%{__cmake3}|' \ %endif %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5 diff --git a/macros.kf5 b/macros.kf5 index 3104569..0c23cc7 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -22,7 +22,7 @@ CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \ - %{?fedora:%{__cmake}}%{?rhel:%{__cmake3}} \\\ + %{__cmake} \\\ %{?__cmake_builddir:-S "%{_vpath_srcdir}"} \\\ %{?__cmake_builddir:-B "%{__cmake_builddir}"} \\\ -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \\\ From fcd89e1745bce73bab2dd9dd8ea16166122431fd Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 14 Jul 2020 14:48:25 -0700 Subject: [PATCH 08/28] Bump the release --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index cd745bc..3d2c90b 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.72.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 +* Tue Jul 14 2020 Troy Dawson - 5.72.0-2 +- Clean up the conditional in macros.kf5 + * Tue Jul 07 2020 Rex Dieter - 5.72.0-1 - 5.72.0 From d9489e2efff0faa8f83f29b41ad7a9c59ea49817 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 21 Jul 2020 13:31:07 -0500 Subject: [PATCH 09/28] own %_docdir/qt5 aka %_qt5_docdir (for kf5 qch docs) --- kf5.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 3d2c90b..b478abf 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.72.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -45,6 +45,7 @@ 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}%{_docdir}/qt5 mkdir -p %{buildroot}%{_libexecdir}/kf5 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/{env,shutdown} @@ -74,12 +75,16 @@ sed -i \ %{_datadir}/knsrcfiles/ %{_datadir}/qlogging-categories5/ %{_datadir}/solid/ +%{_docdir}/qt5/ %files rpm-macros %{_rpmconfigdir}/macros.d/macros.kf5 %changelog +* Tue Jul 21 2020 Rex Dieter - 5.72.0-3 +- own %%_docdir/qt5 aka %%_qt5_docdir (for kf5 qch docs) + * Tue Jul 14 2020 Troy Dawson - 5.72.0-2 - Clean up the conditional in macros.kf5 From 24b230a6c7162db30e1216956769fb47135fcf59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 03:02:26 +0000 Subject: [PATCH 10/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 b478abf..69d1b6c 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.72.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -82,6 +82,9 @@ sed -i \ %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 5.72.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 21 2020 Rex Dieter - 5.72.0-3 - own %%_docdir/qt5 aka %%_qt5_docdir (for kf5 qch docs) From 6287aa9f51132c3714e508459f2b2d804d730988 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 29 Jul 2020 14:31:21 -0500 Subject: [PATCH 11/28] %cmake_kf5: +%undefine __cmake_in_source_build --- kf5.spec | 5 ++++- macros.kf5 | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 69d1b6c..e626b7b 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.72.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -82,6 +82,9 @@ sed -i \ %changelog +* Wed Jul 29 2020 Rex Dieter - 5.72.0-5 +- %%cmake_kf5: +%%undefine __cmake_in_source_build + * Tue Jul 28 2020 Fedora Release Engineering - 5.72.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/macros.kf5 b/macros.kf5 index 0c23cc7..fb0b67f 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -15,7 +15,8 @@ %_kf5_qmldir %_kf5_archdatadir/qml %_kf5_version @@KF5_VERSION@@ -%cmake_kf5 \ +%cmake_kf5 \\\ + %undefine __cmake_in_source_build \ QTDIR="%{_qt5_prefix}" ; export QTDIR ; \ PATH="%{_qt5_bindir}:$PATH" ; export PATH ; \ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ From 3cc232bd5aa79a7ca923f9647fbe5c1c658f40d1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 Aug 2020 11:28:33 -0500 Subject: [PATCH 12/28] 5.73.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index e626b7b..a81a5e2 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.72.0 -Release: 5%{?dist} +Version: 5.73.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -82,6 +82,9 @@ sed -i \ %changelog +* Mon Aug 03 2020 Rex Dieter - 5.73.0-1 +- 5.73.0 + * Wed Jul 29 2020 Rex Dieter - 5.72.0-5 - %%cmake_kf5: +%%undefine __cmake_in_source_build From 75c2acc64b0036c9393a43b4201d0706eaea4dc9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 22 Aug 2020 14:50:59 -0500 Subject: [PATCH 13/28] rpm-macros: Requires: epel-rpm-macros on rhel8 At least until cmake macros are updated in rhel8's cmake, see also https://bugzilla.redhat.com/show_bug.cgi?id=1858941 --- kf5.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index a81a5e2..a176422 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.73.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -27,6 +27,11 @@ Requires: qt5-rpm-macros >= 5.11 Requires: cmake3 Requires: qt5-qtbase-devel >= 5.11 %endif +%if 0%{?rhel} == 8 +# This is where cmake-related macros live, e.g. %%cmake_build, %%cmake_install +# at least until fixed upstream, https://bugzilla.redhat.com/show_bug.cgi?id=1858941 +Requires: epel-rpm-macros +%endif # misc build environment dependencies Requires: gcc-c++ BuildArch: noarch @@ -82,6 +87,9 @@ sed -i \ %changelog +* Sat Aug 22 2020 Rex Dieter - 5.73.0-2 +- rpm-macros: Requires: epel-rpm-macros on rhel8 + * Mon Aug 03 2020 Rex Dieter - 5.73.0-1 - 5.73.0 From fd3a2a684c09aaa8f4b76ec9e510ee50fda135b5 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 18 Sep 2020 11:26:24 +0200 Subject: [PATCH 14/28] 5.74.0 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index a176422..60c0233 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.73.0 -Release: 2%{?dist} +Version: 5.74.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -87,6 +87,9 @@ sed -i \ %changelog +* Fri Sep 18 2020 Jan Grulich - 5.74.0-1 +- 5.74.0 + * Sat Aug 22 2020 Rex Dieter - 5.73.0-2 - rpm-macros: Requires: epel-rpm-macros on rhel8 From 50a66dd92f7aae8a53a396c8f7705919f9596081 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 14 Oct 2020 09:41:24 -0500 Subject: [PATCH 15/28] 5.75.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 60c0233..15e1c54 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.74.0 +Version: 5.75.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -87,6 +87,9 @@ sed -i \ %changelog +* Wed Oct 14 2020 Rex Dieter - 5.75.0-1 +- 5.75.0 + * Fri Sep 18 2020 Jan Grulich - 5.74.0-1 - 5.74.0 From 02a4a92bb8b7af3bd2aff095cfb0934205a1e8dc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Nov 2020 08:51:13 -0600 Subject: [PATCH 16/28] 5.76.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 15e1c54..72aa624 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.75.0 +Version: 5.76.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -87,6 +87,9 @@ sed -i \ %changelog +* Thu Nov 19 08:50:37 CST 2020 Rex Dieter - 5.76.0-1 +- 5.76.0 + * Wed Oct 14 2020 Rex Dieter - 5.75.0-1 - 5.75.0 From 868c73015f58bbd9a3e84caaf2e623d91ef21f55 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 13 Dec 2020 14:05:01 -0600 Subject: [PATCH 17/28] 5.77.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 72aa624..cf94a45 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.76.0 +Version: 5.77.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -87,6 +87,9 @@ sed -i \ %changelog +* Sun Dec 13 13:54:51 CST 2020 Rex Dieter - 5.77.0-1 +- 5.77.0 + * Thu Nov 19 08:50:37 CST 2020 Rex Dieter - 5.76.0-1 - 5.76.0 From 8a529762a118c93c377ffd13ce0cadc86a39f922 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 4 Jan 2021 08:27:55 -0600 Subject: [PATCH 18/28] 5.78 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index cf94a45..3beca4a 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.77.0 +Version: 5.78.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -87,6 +87,9 @@ sed -i \ %changelog +* Mon Jan 04 2021 Rex Dieter - 5.78.0-1 +- 5.78 + * Sun Dec 13 13:54:51 CST 2020 Rex Dieter - 5.77.0-1 - 5.77.0 From fce02e4e3c18defa9b5e5c33060a9909a267e952 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 15:30:12 +0000 Subject: [PATCH 19/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 3beca4a..922ed86 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.78.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -87,6 +87,9 @@ sed -i \ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 5.78.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 04 2021 Rex Dieter - 5.78.0-1 - 5.78 From 927ff395fd8441a5616f1cde733bc88e34e4781a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 6 Feb 2021 09:40:29 -0600 Subject: [PATCH 20/28] 5.79 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 922ed86..936f907 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.78.0 -Release: 2%{?dist} +Version: 5.79.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -87,6 +87,9 @@ sed -i \ %changelog +* Sat Feb 06 2021 Rex Dieter - 5.79.0-1 +- 5.79 + * Tue Jan 26 2021 Fedora Release Engineering - 5.78.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 78b1236ae803e098401d639e1c2ce658835655b1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 9 Mar 2021 08:27:06 -0600 Subject: [PATCH 21/28] 5.80 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 936f907..35447c5 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.79.0 +Version: 5.80.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -87,6 +87,9 @@ sed -i \ %changelog +* Tue Mar 09 2021 Rex Dieter - 5.80.0-1 +- 5.80 + * Sat Feb 06 2021 Rex Dieter - 5.79.0-1 - 5.79 From f98f858331b4fd71ecef4f3d0922d632563fc799 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 6 Apr 2021 08:39:23 -0500 Subject: [PATCH 22/28] 5.81 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 35447c5..26c119c 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.80.0 +Version: 5.81.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -87,6 +87,9 @@ sed -i \ %changelog +* Tue Apr 06 2021 Rex Dieter - 5.81.0-1 +- 5.81 + * Tue Mar 09 2021 Rex Dieter - 5.80.0-1 - 5.80 From bf120a7a13421db882a67efdbf214643f8ffc9a4 Mon Sep 17 00:00:00 2001 From: Onuralp SEZER Date: Mon, 12 Apr 2021 18:02:08 +0000 Subject: [PATCH 23/28] %_kf5_docdir hardcode fix %_docdir to comply macro --- macros.kf5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros.kf5 b/macros.kf5 index fb0b67f..3e39c87 100644 --- a/macros.kf5 +++ b/macros.kf5 @@ -2,7 +2,7 @@ %_kf5_archdatadir %_qt5_archdatadir %_kf5_bindir %_kf5_prefix/bin %_kf5_datadir %_datadir -%_kf5_docdir /usr/share/doc +%_kf5_docdir %_docdir %_kf5_includedir %_includedir/KF5 %_kf5_libdir %_libdir %_kf5_libexecdir %_libexecdir/kf5 From 4bda57688b2b6b3f02333ba1c483b6011178f8fb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 12 Apr 2021 17:43:25 -0500 Subject: [PATCH 24/28] %_kf5_docdir hardcode fix /usr/share/doc to comply macro (thunderbirdtr) --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index 26c119c..9005024 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.81.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -87,6 +87,9 @@ sed -i \ %changelog +* Mon Apr 12 2021 Rex Dieter - 5.81.0-2 +- %%_kf5_docdir hardcode fix %_docdir to comply macro (thunderbirdtr) + * Tue Apr 06 2021 Rex Dieter - 5.81.0-1 - 5.81 From d1067630a2c78bb9e5fc619779b57928da14f91a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 3 May 2021 08:29:03 -0500 Subject: [PATCH 25/28] 5.82 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 9005024..d23f128 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.81.0 -Release: 2%{?dist} +Version: 5.82.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -87,6 +87,9 @@ sed -i \ %changelog +* Mon May 03 2021 Rex Dieter - 5.82.0-1 +- 5.82 + * Mon Apr 12 2021 Rex Dieter - 5.81.0-2 - %%_kf5_docdir hardcode fix %_docdir to comply macro (thunderbirdtr) From 0b43000bb19bdf8c1a648dc9d7c9405396a04c01 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 8 Jun 2021 15:49:30 -0500 Subject: [PATCH 26/28] 5.83.0 --- kf5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5.spec b/kf5.spec index d23f128..3116309 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,5 +1,5 @@ Name: kf5 -Version: 5.82.0 +Version: 5.83.0 Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD @@ -87,6 +87,9 @@ sed -i \ %changelog +* Tue Jun 08 2021 Rex Dieter - 5.83.0-1 +- 5.83.0 + * Mon May 03 2021 Rex Dieter - 5.82.0-1 - 5.82 From 1abda98329b678cef852d017465bc22191e1a2dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:44:43 +0000 Subject: [PATCH 27/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 3116309..46b8023 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 Version: 5.83.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -87,6 +87,9 @@ sed -i \ %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 5.83.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jun 08 2021 Rex Dieter - 5.83.0-1 - 5.83.0 From 3219501b97a0b5602c69f1a6685300cb9f91cc34 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 12 Aug 2021 10:54:36 -0500 Subject: [PATCH 28/28] 5.85 --- kf5.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kf5.spec b/kf5.spec index 46b8023..cf2dac7 100644 --- a/kf5.spec +++ b/kf5.spec @@ -1,6 +1,6 @@ Name: kf5 -Version: 5.83.0 -Release: 2%{?dist} +Version: 5.85.0 +Release: 1%{?dist} Summary: Filesystem and RPM macros for KDE Frameworks 5 License: BSD URL: http://www.kde.org @@ -87,6 +87,9 @@ sed -i \ %changelog +* Thu Aug 12 2021 Rex Dieter - 5.85.0-1 +- 5.85 + * Thu Jul 22 2021 Fedora Release Engineering - 5.83.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild