From bbfe8f79048442dd31d13a1ded9765a610550aef Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Jan 09 2009 01:38:10 +0000
Subject: sync w/devel branch


---

diff --git a/kde-filesystem.spec b/kde-filesystem.spec
index d839da9..545740c 100644
--- a/kde-filesystem.spec
+++ b/kde-filesystem.spec
@@ -17,7 +17,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 20%{?dist}
+Release: 23%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -33,7 +33,6 @@ Source2: macros.kde4
 
 Source3: applnk-hidden-directory
 
-# Requires: kde4-macros(api) = %{_kde4_macros_api}
 Provides: kde4-macros(api) = %{_kde4_macros_api} 
 
 BuildRequires: gawk
@@ -176,6 +175,16 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %changelog
+* Thu Jan 08 2009 Rex Dieter <rdieter@fedoraproject.org> 4-23
+- macros.kde4: use %%_cmake_lib_suffix64, %%_cmake_lib_suffix64
+
+* Thu Dec 04 2008 Rex Dieter <rdieter@fedoraproject.org> 4-22
+- macros.kde4: (re)add -DCMAKE_SKIP_RPATH:BOOL=ON
+
+* Tue Dec 02 2008 Rex Dieter <rdieter@fedoraproject.org> 4-21
+- sync latest cmake macros
+- macros.kde4: add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake_kde4 (#474053)
+
 * Wed Oct 08 2008 Than Ngo <than@redhat.com> 4-20
 - /usr/share/wallpapers owned by desktop-backgrounds-basic
 
diff --git a/macros.kde4 b/macros.kde4
index 86d055b..cb7d7e6 100644
--- a/macros.kde4
+++ b/macros.kde4
@@ -3,8 +3,6 @@
 # initial try, including only items that vary from defaults
 #
 
-%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON 
-
 %cmake_kde4 \
   QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
   PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
@@ -12,14 +10,16 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %{__cmake} \\\
-  %if "%{_lib}" == "lib64" \
-    -DLIB_SUFFIX=64 \\\
-  %endif \
-  %{?_cmake_skip_rpath} \\\
-  -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
-  -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
-  -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
-  -DINCLUDE_INSTALL_DIR=%{_kde4_includedir} \\\
-  -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
-  -DLIBEXEC_INSTALL_DIR=%{_kde4_libexecdir} \\\
-  -DDATA_INSTALL_DIR=%{_kde4_appsdir}
+    -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
+    -DBUILD_SHARED_LIBS:BOOL=ON \\\
+    -DCMAKE_INSTALL_PREFIX:PATH=%{_kde4_prefix} \\\
+    -DCMAKE_VERBOSE_MAKEFILE=ON \\\
+    -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \\\
+    -DINCLUDE_INSTALL_DIR:PATH=%{_kde4_includedir} \\\
+    -DLIB_INSTALL_DIR:PATH=%{_kde4_libdir} \\\
+    -DLIBEXEC_INSTALL_DIR:PATH=%{_kde4_libexecdir} \\\
+    -DSYSCONF_INSTALL_DIR:PATH=%{_kde4_sysconfdir} \\\
+%if "%{?_lib}" == "lib64" \
+     %{?_cmake_lib_suffix64} \\\
+%endif \
+     %{?_cmake_skip_rpath}