rpm-macros: revert KDE_INSTALL_INCLUDEDIR change, set CMAKE_INSTALL_INCLUDEDIR_KF5 instead

kf5.spec

@@ -1,6 +1,6 @@
 Name:           kf5
 Version:        5.22.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Filesystem and RPM macros for KDE Frameworks 5
 License:        BSD
 URL:            http://www.kde.org
@@ -69,6 +69,9 @@ sed -i \
 
 
 %changelog
+* Sun May 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.22.0-4
+- rpm-macros: revert KDE_INSTALL_INCLUDEDIR change, set CMAKE_INSTALL_INCLUDEDIR_KF5 instead
+
 * Sat May 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.22.0-3
 - rpm-macros: fix archdatadir, MKSPECS_INSTALL_DIR
 

macros.kf5

@@ -25,13 +25,14 @@
     -DBUILD_SHARED_LIBS:BOOL=ON \\\
     -DBUILD_TESTING:BOOL=FALSE \\\
     -DCMAKE_BUILD_TYPE=%{_kf5_buildtype} \\\
-    -DCMAKE_INSTALL_LIBEXECDIR_KF5=%{_kf5_libexecdir} \\\
+    -DCMAKE_INSTALL_INCLUDEDIR_KF5:PATH=%{_kf5_includedir} \\\
+    -DCMAKE_INSTALL_LIBEXECDIR_KF5:PATH=%{_kf5_libexecdir} \\\
     -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\
     -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON \\\
     -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
     -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kf5_archdatadir}/mkspecs/modules \\\
     -DKDE_INSTALL_BINDIR:PATH=%{_kf5_bindir} \\\
-    -DKDE_INSTALL_INCLUDEDIR:PATH=%{_kf5_includedir} \\\
+    -DKDE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \\\
     -DKDE_INSTALL_KCFGDIR:PATH=%{_datadir}/config.kcfg \\\
     -DKDE_INSTALL_LIBDIR:PATH=%{_kf5_libdir} \\\
     -DKDE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\