diff --git a/cmake.spec b/cmake.spec
index aa4024b26673e732a383071f7bfb6324be2b2113..2184e90a01c620d1563c889653061602d3edeca0 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -22,7 +22,7 @@
 
 Name:           cmake
 Version:        3.25.0
-Release:        1%{?dist} 
+Release:        2%{?dist} 
 Summary:        Cross-platform make system
 
 License:        BSD and MIT and zlib
@@ -284,6 +284,7 @@ pushd %{_vpath_builddir}
 NO_TEST="CTestTestUpload"
 NO_TEST="$NO_TEST|CustomCommand|CMakeLib.testCTestResourceAllocator"
 NO_TEST="$NO_TEST|CMakeLib.testCTestResourceSpec|RunCMake.PositionIndependentCode"
+NO_TEST="$NO_TEST|CPackComponentsForAll-RPM-IgnoreGroup"
 %if %{with bootstrap}
 NO_TEST="$NO_TEST|curl"
 %endif
@@ -324,7 +325,7 @@ popd
 %files gui
 %{_bindir}/%{name}-gui
 %{_datadir}/applications/%{name}-gui.desktop
-%{_datadir}/mime/packages
+%{_datadir}/mime/packages/*.xml
 %{_datadir}/icons/hicolor/*/apps/CMake%{?name_suffix}Setup.png
 %if %{with sphinx}
 %{_mandir}/man1/%{name}-gui.1.*
@@ -340,6 +341,10 @@ popd
 %endif
 
 %changelog
+* Wed Nov 23 2022 Funda Wang <fundawang@yeah.net> - 3.25.0-2
+- Add GNUInstallDirs parameters as stated upstream
+  https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
+
 * Thu Nov 17 2022 Funda Wang <fundawang@yeah.net> - 3.25.0-1
 - New version 3.25.0
 
diff --git a/macros.cmake b/macros.cmake
index 54598ee26c540914814682b6ef1e77d96ed4fa00..1716c30abe779f7d8a1a0cb52448c07594824b48 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -35,6 +35,10 @@
         -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
         -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
         -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} \\\