rpms/kde-filesystem/devel kde-filesystem.spec, 1.35, 1.36 macros.kde4, 1.11, 1.12

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28293

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4-23
- macros.kde4: use %_cmake_lib_suffix64, %_cmake_lib_suffix64



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kde-filesystem.spec	4 Dec 2008 21:50:52 -0000	1.35
+++ kde-filesystem.spec	9 Jan 2009 01:35:58 -0000	1.36
@@ -17,7 +17,7 @@
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 22%{?dist}
+Release: 23%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -33,7 +33,6 @@
 
 Source3: applnk-hidden-directory
 
-# Requires: kde4-macros(api) = %{_kde4_macros_api}
 Provides: kde4-macros(api) = %{_kde4_macros_api} 
 
 BuildRequires: gawk
@@ -176,12 +175,15 @@
 
 
 %changelog
+* Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> 4-23
+- macros.kde4: use %%_cmake_lib_suffix64, %%_cmake_lib_suffix64
+
 * Thu Dec 04 2008 Rex Dieter <rdieter at fedoraproject.org> 4-22
-- (re)add -DCMAKE_SKIP_RPATH:BOOL=ON
+- macros.kde4: (re)add -DCMAKE_SKIP_RPATH:BOOL=ON
 
 * Tue Dec 02 2008 Rex Dieter <rdieter at fedoraproject.org> 4-21
 - sync latest cmake macros
-- Add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake_kde4 (#474053)
+- macros.kde4: add -DCMAKE_VERBOSE_MAKEFILE=ON to %%cmake_kde4 (#474053)
 
 * Wed Oct 08 2008 Than Ngo <than at redhat.com> 4-20
 - /usr/share/wallpapers owned by desktop-backgrounds-basic


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/macros.kde4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- macros.kde4	4 Dec 2008 21:50:52 -0000	1.11
+++ macros.kde4	9 Jan 2009 01:35:58 -0000	1.12
@@ -11,14 +11,15 @@
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
   %{__cmake} \\\
     -DCMAKE_BUILD_TYPE=%{_kde4_buildtype} \\\
+    -DBUILD_SHARED_LIBS:BOOL=ON \\\
     -DCMAKE_INSTALL_PREFIX:PATH=%{_kde4_prefix} \\\
-    -DCMAKE_SKIP_RPATH:BOOL=ON \\\
     -DCMAKE_VERBOSE_MAKEFILE=ON \\\
     -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \\\
     -DINCLUDE_INSTALL_DIR:PATH=%{_kde4_includedir} \\\
     -DLIB_INSTALL_DIR:PATH=%{_kde4_libdir} \\\
-%if "%{_lib}" == "lib64" \
-    -DLIB_SUFFIX=64 \\\
-%endif \
     -DLIBEXEC_INSTALL_DIR:PATH=%{_kde4_libexecdir} \\\
-    -DSYSCONF_INSTALL_DIR:PATH=%{_kde4_sysconfdir}
+    -DSYSCONF_INSTALL_DIR:PATH=%{_kde4_sysconfdir} \\\
+%if "%{?_lib}" == "lib64" \
+     %{?_cmake_lib_suffix64} \\\
+%endif \
+     %{?_cmake_skip_rpath}