[packages/rpm-build-macros] - 1.684: sanitized cmake macro by removing 3 of 4 non-standard parameters (with exhaustive comment)

[qboosh]

commit b6ce5bb6a311437b480b901de363d834770f1ab8
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date:   Mon Jan 27 18:44:29 2014 +0100

    - 1.684: sanitized cmake macro by removing 3 of 4 non-standard parameters 
(with exhaustive comment)

 rpm-build-macros.spec |  2 +-
 rpm.macros            | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 6465169..9b36367 100644
--- 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 8584507..303c0c3 100644
--- 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}" \\\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/b6ce5bb6a311437b480b901de363d834770f1ab8

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit