diff --git a/kde-filesystem.spec b/kde-filesystem.spec index f863902..a4eff20 100644 --- a/kde-filesystem.spec +++ b/kde-filesystem.spec @@ -22,7 +22,7 @@ Summary: KDE filesystem layout Name: kde-filesystem Version: 4 -Release: 34%{?dist} +Release: 35%{?dist} Group: System Environment/Base License: Public Domain @@ -186,7 +186,10 @@ rm -rf $RPM_BUILD_ROOT %{name}.list %changelog -* Mon Feb 01 2010 Rex Dieter - 4-35 +- macros.kde4: restore %%cmake_lib_suffix64 + +* Mon Feb 01 2010 Rex Dieter - 4-34 - macros.kde4: %%cmake_kde4: drop %%cmake_skip_rpath, %%cmake_lib_suffix64 * Wed Jan 27 2010 Rex Dieter - 4-33 diff --git a/macros.kde4 b/macros.kde4 index f39fd51..e5bd5c3 100644 --- a/macros.kde4 +++ b/macros.kde4 @@ -20,5 +20,8 @@ -DDATA_INSTALL_DIR:PATH=%{_kde4_appsdir} \\\ -DINCLUDE_INSTALL_DIR:PATH=%{_kde4_includedir} \\\ -DLIB_INSTALL_DIR:PATH=%{_kde4_libdir} \\\ +%if "%{?_lib}" == "lib64" \ + %{?_cmake_lib_suffix64} \\\ +%endif \ -DLIBEXEC_INSTALL_DIR:PATH=%{_kde4_libexecdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_kde4_sysconfdir}