rpms/kde-filesystem/devel kde-filesystem.spec, 1.47, 1.48 macros.kde4, 1.15, 1.16

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
* Mon Feb 01 2010 Rex Dieter <rdieter at fedoraproject.org. - 4-34
- macros.kde4: %cmake_kde4: drop %cmake_skip_rpath, %cmake_lib_suffix64



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- kde-filesystem.spec	1 Feb 2010 17:09:01 -0000	1.47
+++ kde-filesystem.spec	1 Feb 2010 20:53:58 -0000	1.48
@@ -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 at fedoraproject.org. - 4-34
+- macros.kde4: %%cmake_kde4: drop %%cmake_skip_rpath, %%cmake_lib_suffix64
+
 * Wed Jan 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 4-33
 - macros.kde4: %%{_kde4_version} using (upstreamed) --kde-version now 
 


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/macros.kde4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- macros.kde4	1 Feb 2010 17:09:01 -0000	1.15
+++ macros.kde4	1 Feb 2010 20:53:59 -0000	1.16
@@ -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}