- 1.684: sanitized cmake macro by removing 3 of 4 non-standard parameters (with exhau...

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 64651697be72748a4da87de1e7384e31027a2799..9b3636799d0e1e8ecb917f8461af4f482eb62a6a 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -5,7 +5,7 @@
 %if "%{pld_release}" == "ac"
 %define        with_rpm4       1
 %endif
-%define                rpm_macros_rev  1.683
+%define                rpm_macros_rev  1.684
 %define                find_lang_rev   1.36
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index 858450783abba7f13e3a9cb315534583e5c40afa..303c0c39690a07013adafdc13f29eb66cc11191d 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -238,6 +238,15 @@
        %{dependencytracking} \
 }
 
+# Note: pass only standard cmake macros here.
+# The only exception is SYSCONF_INSTALL_DIR, used commonly in KDE packages,
+# where the default (${CMAKE_INSTALL_PREFIX}/etc) is not FHS-compliant and
+# absolute path MUST be used to comply with FHS.
+# The other non-standard cmake macros used commonly in KDE
+# (INCLUDE_INSTALL_DIR, LIB_INSTALL_DIR, SHARE_INSTALL_PREFIX)
+# have sane default values in KDE, and some packages use these names
+# in different way (e.g. expect them to be always relative or always
+# absolute).
 %cmake \
 %{?__cc:CC="${CC:-%{__cc}}"} \\\
 %{?__cxx:CXX="${CXX:-%{__cxx}}"} \\\
@@ -247,9 +256,6 @@ CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
        -DCMAKE_BUILD_TYPE=%{!?debug:PLD}%{?debug:Debug} \\\
        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-       -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-       -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
-       -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
        -DCMAKE_CXX_FLAGS_PLD="${CXXFLAGS:-%{rpmcxxflags} -DNDEBUG -DQT_NO_DEBUG}" \\\
        -DCMAKE_C_FLAGS_PLD="${CFLAGS:-%{rpmcflags} -DNDEBUG -DQT_NO_DEBUG}" \\\