Merge branch 'f34' into epel8

kf5.spec

@@ -1,6 +1,6 @@
 Name:    kf5
-Version: 5.68.0
+Version: 5.85.0
-Release: 4%{?dist}
+Release: 1%{?dist}
 Summary: Filesystem and RPM macros for KDE Frameworks 5
 License: BSD
 URL:     http://www.kde.org
@@ -21,13 +21,17 @@ Filesystem for KDE Frameworks 5.
 %package rpm-macros
 Summary: RPM macros for KDE Frameworks 5
 %if 0%{?fedora} || 0%{?rhel} > 7
-# We need the correct macros
+Requires: cmake >= 3
-Requires: cmake >= 3.18
 Requires: qt5-rpm-macros >= 5.11
 %else
 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
@@ -46,6 +50,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}
 
@@ -75,20 +80,87 @@ sed -i \
 %{_datadir}/knsrcfiles/
 %{_datadir}/qlogging-categories5/
 %{_datadir}/solid/
+%{_docdir}/qt5/
 
 %files rpm-macros
 %{_rpmconfigdir}/macros.d/macros.kf5
 
 
 %changelog
-* Thu May 20 2021 Neal Gompa <ngompa13@gmail.com> - 5.68.0-4
+* Thu Aug 12 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.85.0-1
-- Fix macros to work with new cmake for RHEL 8.4+
+- 5.85
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.83.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 08 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.83.0-1
+- 5.83.0
+
+* Mon May 03 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.82.0-1
+- 5.82
+
+* Mon Apr 12 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.81.0-2
+- %%_kf5_docdir hardcode fix %_docdir to comply macro (thunderbirdtr)
+
+* Tue Apr 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.81.0-1
+- 5.81
+
+* Tue Mar 09 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.80.0-1
+- 5.80
+
+* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.79.0-1
+- 5.79
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.78.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jan 04 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.78.0-1
+- 5.78
+
+* Sun Dec 13 13:54:51 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.77.0-1
+- 5.77.0
+
+* Thu Nov 19 08:50:37 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.76.0-1
+- 5.76.0
+
+* Wed Oct 14 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.75.0-1
+- 5.75.0
+
+* Fri Sep 18 2020 Jan Grulich <jgrulich@redhat.com> - 5.74.0-1
+- 5.74.0
+
+* Sat Aug 22 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.73.0-2
+- rpm-macros: Requires: epel-rpm-macros on rhel8
+
+* Mon Aug 03 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.73.0-1
+- 5.73.0
+
+* Wed Jul 29 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.72.0-5
+- %%cmake_kf5: +%%undefine __cmake_in_source_build
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.72.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 21 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.72.0-3
+- own %%_docdir/qt5 aka %%_qt5_docdir (for kf5 qch docs)
+
+* Tue Jul 14 2020 Troy Dawson <tdawson@redhat.com> - 5.72.0-2
+- Clean up the conditional in macros.kf5
+
+* Tue Jul 07 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.72.0-1
+- 5.72.0
+
+* Fri Jul 03 2020 Neal Gompa <ngompa13@gmail.com> - 5.71.0-2
+- Support automatically doing out of tree builds if cmake is configured as such
+
+* Tue Jun 16 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.71.0-1
+- 5.71.0
 
-* Wed Aug 26 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.68.0-3
+* Mon May 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.70.0-1
-- Use something that actually works with el8's cmake-3.11
+- 5.70.0
 
-* Tue Aug 25 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.68.0-2
+* Tue Apr 21 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.69.0-1
-- (branch) backport recent cmake changes from fedora
+- 5.69.0
 
 * Thu Mar 19 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.68.0-1
 - 5.68

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