From e4b6a45109827bf4822a0e10fa39964cab2fa19c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Feb 01 2010 20:53:59 +0000
Subject: - macros.kde4: %cmake_kde4: drop %cmake_skip_rpath, %cmake_lib_suffix64


---

diff --git a/kde-filesystem.spec b/kde-filesystem.spec
index ade07cd..f863902 100644
--- a/kde-filesystem.spec
+++ b/kde-filesystem.spec
@@ -22,7 +22,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 33%{?dist}
+Release: 34%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -186,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %changelog
+* Mon Feb 01 2010 Rex Dieter <rdieter@fedoraproject.org. - 4-34
+- macros.kde4: %%cmake_kde4: drop %%cmake_skip_rpath, %%cmake_lib_suffix64
+
 * Wed Jan 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 4-33
 - macros.kde4: %%{_kde4_version} using (upstreamed) --kde-version now 
 
diff --git a/macros.kde4 b/macros.kde4
index 6af7730..f39fd51 100644
--- a/macros.kde4
+++ b/macros.kde4
@@ -13,16 +13,12 @@
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %{__cmake} \\\
-    -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
     -DBUILD_SHARED_LIBS:BOOL=ON \\\
+    -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
     -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}
+    -DSYSCONF_INSTALL_DIR:PATH=%{_kde4_sysconfdir}