From f7946ba583692d00baa559077de337acb605491d Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Fri, 11 Feb 2022 16:41:22 +0800
Subject: [PATCH] update upstream version 5.90.0

---
 kf5.spec   | 49 ++++++++++++++++++++++++++-----------------------
 macros.kf5 |  9 ++++++---
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/kf5.spec b/kf5.spec
index 5c97e6c..d1aed6a 100644
--- a/kf5.spec
+++ b/kf5.spec
@@ -1,47 +1,45 @@
 Name:       kf5
-Version:    5.68.0
+Version:    5.90.0
 Release:    1
-Summary:    Filesystem and RPM macros of KDE Frameworks 5
+Summary:    Filesystem and RPM macros for KDE Frameworks 5
 License:    BSD
 URL:        http://www.kde.org
 
 Source0:    macros.kf5
 
 %description
-Filesystem and RPM macros of KDE Frameworks 5.
+Filesystem and RPM macros for KDE Frameworks 5
 
 %package filesystem
-Summary:    Filesystem of KF5
+Summary:    Filesystem for KDE Frameworks 5
 Obsoletes:  kf5-filesystem < 5.10.0-2
 %{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}}
 
 %description filesystem
-Filesystem of KF5.
+Filesystem for KDE Frameworks 5.
 
 %package rpm-macros
-Summary:    RPM macros of KF5
+Summary:    RPM macros for KDE Frameworks 5
 Requires:   cmake >= 3 qt5-rpm-macros >= 5.10
 Requires:   gcc-c++
 BuildArch:  noarch
 
 %description rpm-macros
-RPM macros of KF5.
+RPM macros for building KDE Frameworks 5 packages.
 
 %install
-install -d %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins/kf5/
-install -d %{buildroot}%{_prefix}/{lib,%{_lib}}/kconf_update_bin
-install -d %{buildroot}%{_includedir}/KF5
-install -d %{buildroot}%{_datadir}/{config.kcfg,kconf_update,kf5,kservicetypes5}
-install -d %{buildroot}%{_datadir}/kpackage/genericqml
-install -d %{buildroot}%{_datadir}/kpackage/kcms
-install -d %{buildroot}%{_datadir}/kservices5/ServiceMenus
-install -d %{buildroot}%{_datadir}/solid/actions
-install -d %{buildroot}%{_datadir}/solid/devices
-install -d %{buildroot}%{_datadir}/knsrcfiles/
-install -d %{buildroot}%{_datadir}/qlogging-categories5/
-install -d %{buildroot}%{_libexecdir}/kf5
-install -d %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env
-install -d %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/shutdown
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt5/plugins/kf5/
+mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/kconf_update_bin
+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}%{_docdir}/qt5
+mkdir -p %{buildroot}%{_libexecdir}/kf5
+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" %{buildroot}%{_rpmconfigdir}/macros.d/macros.kf5
 
@@ -56,13 +54,18 @@ sed -i -e "s|@@KF5_VERSION@@|%{version}|g" %{buildroot}%{_rpmconfigdir}/macros.d
 %{_datadir}/{config.kcfg,kconf_update,kf5,kpackage,kservices5,kservicetypes5,solid}
 %{_datadir}/knsrcfiles/
 %{_datadir}/qlogging-categories5/
+%{_docdir}/qt5/
 
 %files rpm-macros
 %{_rpmconfigdir}/macros.d/macros.kf5
 
 %changelog
-* Wed Jan 12 2022 peijiankang<peijiankang@kylinos.com> - 5.68.0-1
-- update to upstream version 5.68.0
+* Fri Feb 11 2022 tanyulong <tanyulong@kylinos.com> - 5.90.0-1
+- update to upstream version 5.90.0
+
+* Thu Jan 20 2022 peijiankang<peijiankang@kylinos.com> - 5.88.0-1
+- update to upstream version 5.88.0
 
 * Sat Mar 07 2020 daiqianwen <daiqianwen@huawei.com> - 5.59.0-2
 - Package init
+
diff --git a/macros.kf5 b/macros.kf5
index 21491c1..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
@@ -15,14 +15,17 @@
 %_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 ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
   %{?__global_ldflags:LDFLAGS="${LDFLAGS:-%__global_ldflags}" ; export LDFLAGS ;} \
-  %{__cmake} \\\
+    %{__cmake} \\\
+    %{?__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" \\\