diff -ru orig/kf5.macros alt/kf5.macros
--- orig/kf5.macros	2018-10-18 18:18:26.000000000 +0300
+++ alt/kf5.macros	2018-10-27 18:23:28.921336018 +0300
@@ -1,38 +1,44 @@
-%kf5_version 5.51.0
+%_kf5_version 5.51.0
 
 %_kf5_prefix %_prefix
-%_kf5_libdir %_kf5_prefix/%_lib
-%_kf5_libexecdir %_libexecdir/kf5
-%_kf5_iconsdir %_kf5_prefix/share/icons
+%_kf5_archdatadir %_K5archdata
+%_kf5_bindir %_K5bin
+%_kf5_datadir %_K5data
+%_kf5_docdir /usr/share/doc
+%_kf5_includedir %_K5inc
+%_kf5_libdir %_K5lib
+#_kf5_libexecdir %_K5exec
+%_kf5_libexecdir %_K5libexecdir
+%_kf5_metainfodir %_datadir/metainfo
+%_kf5_qtplugindir %_qt5_plugindir
+%_kf5_plugindir %_K5plug
 %_kf5_sysconfdir %_sysconfdir
-%_kf5_datadir %_kf5_prefix/share
-%_kf5_applicationdir %_kf5_prefix/share/applications
+%_kf5_mandir %_mandir
+%_kf5_buildtype %__kf5_buildtype
+%_kf5_qmldir %_K5qml
+
+# compat for mageia
+%_kf5_iconsdir %_K5icon
+%_kf5_applicationdir %_K5data/applications
 %_kf5_appdatadir %_kf5_prefix/share/appdata
-%_kf5_metainfodir %_kf5_prefix/share/appdata
 %_kf5_pure_datadir %_kf5_prefix/share
-%_kf5_configdir %_kf5_datadir/config
+%_kf5_configdir %_K5conf
 %_kf5_appsdir %_kf5_datadir/apps
-%_kf5_applicationsdir %_kf5_datadir/applications
-%_kf5_docdir %_kf5_prefix/share/doc
-%_kf5_bindir %_kf5_prefix/bin
-%_kf5_sbindir %_kf5_prefix/sbin
-%_kf5_includedir %_kf5_prefix/include/KF5
-%_kf5_mandir %_mandir
-%_kf5_autostart %_kf5_prefix/share/autostart
-%_kf5_services %_kf5_prefix/share/kservices5
-%_kf5_servicetypes %_kf5_prefix/share/kservicetypes5
-%_kf5_plugindir %_qt5_plugindir/kf5
-%_kf5_mkspecsdir %_kf5_libdir/qt5/mkspecs/modules
-%_kf5_qmldir %_qt5_prefix/qml
-%_kf5_knotificationsdir %_kf5_prefix/share/knotifications5
+%_kf5_applicationsdir %_kf5_xdgapp
+%_kf5_sbindir %_K5sbin
+%_kf5_autostart %_K5start
+%_kf5_services %_K5srv
+%_kf5_servicetypes %_K5srvtyp
+%_kf5_mkspecsdir %_K5archdata/mkspecs/modules
+%_kf5_knotificationsdir %_K5notif
 
-%_kf5_debug %(if [ "%mageia_branch" = "Cauldron" ]; then echo Debug; else echo Release; fi)
+%_kf5_debug %(echo Release)
 
-
-%cmake_kf5 \
+%mageia_cmake_kf5 \
   QTDIR="%_qt5_prefix" ; export QTDIR ; \
   PATH="%_qt5_bindir:$PATH" ; export PATH ; \
-  %cmake \\\
+  %mageia_cmake \\\
+	    -DCMAKE_SKIP_RPATH:BOOL=yes \\\
     -DBUILD_SHARED_LIBS:BOOL=ON \\\
     -DBUILD_TESTING:BOOL=FALSE \\\
     -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\
@@ -70,6 +76,9 @@
     -DKDE_INSTALL_QTQUICKIMPORTSDIR:PATH=%{_qt5_importdir} \\\
     -DKDE_INSTALL_SYSCONFDIR:PATH=%{_kf5_sysconfdir}
 
+
+# TODO: use %%K5find_qtlang?
+
 # %%find_lang_kf5
 #
 # This macro is used in KDE Frameworks 5 packages instead of %%find_lang,
diff -ru orig/macros.cmake alt/macros.cmake
--- orig/macros.cmake	2019-12-26 14:05:22.000000000 +0200
+++ alt/macros.cmake	2020-02-24 20:22:56.209521859 +0200
@@ -4,45 +4,37 @@
 # Warning: do not remove the -DCMAKE_MODULE_LINKER_FLAGS command as it is required to build kde and qt apps
 #
 
-%__cmake %{_bindir}/cmake
 %__ctest %{_bindir}/ctest
 
-%_cmake_verbose -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-%_cmake_debug %{?with_debug:debug}%{?!with_debug:RelWithDebInfo}
-%_cmake_module_linker_flags %(echo %ldflags|sed -e 's#-Wl,--no-undefined##')
-
-%cmake \
-    %set_build_flags \
-    %__cmake \\\
+%mageia_cmake \
+    cmake \\\
         -S %{_vpath_srcdir} \\\
         -B %{_vpath_builddir} \\\
-        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
+        -DCMAKE_SKIP_INSTALL_RPATH:BOOL=yes \\\
+	-DCMAKE_C_FLAGS:STRING='%optflags' \\\
+	-DCMAKE_CXX_FLAGS:STRING='%optflags' \\\
+	-DCMAKE_Fortran_FLAGS:STRING='%optflags' \\\
+	-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
         -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\
-        -DCMAKE_INSTALL_RUNSTATEDIR:PATH=%{_rundir} \\\
         -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \\\
         -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
         -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
         -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
-        -DCMAKE_BUILD_TYPE=%{_cmake_debug} \\\
-        -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-DNDEBUG" \\\
-        -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-DNDEBUG" \\\
-%if "%{?_lib}" == "lib64" \
-        -DLIB_SUFFIX=64 \\\
-%endif \
-        %{?_cmake_verbose} \\\
-        %{?_cmake_module_linker_flags:-DCMAKE_MODULE_LINKER_FLAGS="%_cmake_module_linker_flags%{?_cmake_module_linker_flags_extra: %_cmake_module_linker_flags_extra}"} \\\
+	-DLIB_DESTINATION=%_lib \\\
+	-DLIB_SUFFIX="%_libsuff" \\\
+        %{?_cmake_verbose: -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON} \\\
         -DBUILD_SHARED_LIBS:BOOL=ON \\\
         -DBUILD_STATIC_LIBS:BOOL=OFF
 
-%cmake_build \
+%mageia_cmake_build \
     %make_build -C %{_vpath_builddir}
 
-%cmake_install \
-    %make_install -C %{_vpath_builddir}
+%mageia_cmake_install \
+    %makeinstall_std -C %{_vpath_builddir}
 
-%ctest \
+%mageia_ctest \
     cd %{_vpath_builddir} \
     %__ctest --output-on-failure --force-new-ctest-process %{?_smp_mflags} \
     cd ..
diff -ru orig/qt4.macros alt/qt4.macros
--- orig/qt4.macros	2016-05-13 20:56:59.000000000 +0300
+++ alt/qt4.macros	2016-06-12 04:17:08.000000000 +0300
@@ -9,29 +9,13 @@
 %_qt4_prefix %{_libdir}/qt4
 %_qt4_datadir %{_qt4_prefix}
 %_qt4_bindir %{_qt4_prefix}/bin
-%_qt4_docdir %{_docdir}/qt4
-%_qt4_libdir %{_libdir}
 %_qt4_includedir %{_includedir}
-%_qt4_plugindir %{_qt4_prefix}/plugins
-%_qt4_demosdir %{_qt4_prefix}/demos
 %_qt4_examplesdir %{_qt4_prefix}/examples
-%_qt4_importdir %{_qt4_prefix}/imports
-%_qt4_translationdir %{_datadir}/qt4/translations
 %_qt4_sysconfigdir %{_sysconfdir}
 
-%qmake_qt4 \
-  %{_qt4_bindir}/qmake \\\
-  %if "%{_lib}" != "lib" \
-     libsuff=64 \\\
-  %endif \
-  QMAKE_CFLAGS="${CFLAGS:-%optflags}" \\\
-  QMAKE_CXXFLAGS="${CXXFLAGS:-%optflags}" \\\
-  QMAKE_LFLAGS="%{?ldflags}" \\\
-  QMAKE_STRIP=
-
-%cmake_qt4 \
+%mageia_cmake_qt4 \
   QTDIR="%{_qt4_datadir}" ; export QTDIR ; \
   PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
-  %cmake \\\
+  %mageia_cmake \\\
   -DDBUS_SERVICES_DIR=%{_datadir}/dbus-1/services \\\
   -DDBUS_INTERFACES_DIR=%{_datadir}/dbus-1/interfaces
diff -ru orig/qt5.macros alt/qt5.macros
--- orig/qt5.macros	2016-06-01 11:57:02.000000000 +0300
+++ alt/qt5.macros	2016-06-07 15:25:51.000000000 +0300
@@ -1,34 +1,14 @@
 # Qt5 macros
-%_qt5_prefix %{_libdir}/qt5
-%_qt5_datadir %{_qt5_prefix}
-%_qt5_bindir %{_qt5_prefix}/bin
-%_qt5_docdir %{_docdir}/qt5
-%_qt5_libdir %{_libdir}
-%_qt5_includedir %{_qt5_prefix}/include
-%_qt5_plugindir %{_qt5_prefix}/plugins
+%_qt5_includedir %{_qt5_headerdir}
 %_qt5_demosdir %{_qt5_prefix}/demos
 %_qt5_examplesdir %{_qt5_prefix}/examples
-%_qt5_importdir %{_qt5_prefix}/imports
-%_qt5_translationdir %{_datadir}/qt5/translations
-%_qt5_settingsdir %{_sysconfdir}/xdg
 %_qt5_sysconfigdir %{_qt5_settingsdir}
-%_qt5_sysconfdir %{_qt5_settingsdir}
-%_qt5_qml %_qt5_prefix/qml 
+%_qt5_qml %{_qt5_qmldir}
 
-%qmake_qt5 \
-  %{_qt5_bindir}/qmake \\\
-  %if "%{_lib}" != "lib" \
-     libsuff=64 \\\
-  %endif \
-  QMAKE_CFLAGS="${CFLAGS:-%optflags}" \\\
-  QMAKE_CXXFLAGS="${CXXFLAGS:-%optflags}" \\\
-  QMAKE_LFLAGS="%{?ldflags}" \\\
-  QMAKE_STRIP=
-
-%cmake_qt5 \
+%mageia_cmake_qt5 \
   QTDIR="%{_qt5_datadir}" ; export QTDIR ; \
   PATH="%{_qt5_bindir}:$PATH" ; export PATH ; \
-  %cmake \\\
+  %mageia_cmake \\\
   -DDBUS_SERVICES_DIR=%{_datadir}/dbus-1/services \\\
   -DDBUS_INTERFACES_DIR=%{_datadir}/dbus-1/interfaces
 
diff -ru orig/scons.macros alt/scons.macros
--- orig/scons.macros	2016-04-15 00:24:19.000000000 +0300
+++ alt/scons.macros	2016-06-07 15:15:18.000000000 +0300
@@ -1,7 +1,6 @@
 %__scons	%{_bindir}/scons
 
 %configure_scons \
-  %setup_compile_flags \
   %__scons configure \\\
     prefix=%{_prefix} \\\
     execprefix=%{_exec_prefix} \\\
@@ -9,12 +8,11 @@
     libdir=%{_libdir}
 
 %configure_scons_kde3 \
-  %setup_compile_flags \
   %__scons configure \\\
     prefix=%{_kde3_prefix} \\\
     execprefix=%{_kde3_prefix} \\\
-    datadir=%{_kde3_datadir} \\\
-    libdir=%{_kde3_libdir}
+    datadir=%{_K3datadir} \\\
+    libdir=%{_K3libdir}
 
 %scons		%__scons %_smp_mflags