diff --git a/kdebindings-4.0.80-lib64.patch b/kdebindings-4.0.80-lib64.patch index 1a1108c..9e1e7f7 100644 --- a/kdebindings-4.0.80-lib64.patch +++ b/kdebindings-4.0.80-lib64.patch @@ -1,7 +1,46 @@ +Index: ruby/qtruby/src/CMakeLists.txt +=================================================================== +--- ruby/qtruby/src/CMakeLists.txt (Revision 813503) ++++ ruby/qtruby/src/CMakeLists.txt (Revision 813529) +@@ -33,7 +33,7 @@ + + set_target_properties(qtruby4 PROPERTIES PREFIX "") + +-install(TARGETS qtruby4shared LIBRARY DESTINATION lib ) ++install(TARGETS qtruby4shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} ) + install(TARGETS qtruby4 DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR}) + + install(FILES qtruby.h marshall.h marshall_basetypes.h marshall_complex.h marshall_primitives.h marshall_types.h smokeruby.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qtruby) +Index: smoke/qsci/CMakeLists.txt +=================================================================== +--- smoke/qsci/CMakeLists.txt (Revision 813503) ++++ smoke/qsci/CMakeLists.txt (Revision 813529) +@@ -70,7 +70,7 @@ + + set_target_properties(smokeqsci PROPERTIES VERSION 2.0.0 SOVERSION 2 ) + +-install(TARGETS smokeqsci DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ) ++install(TARGETS smokeqsci DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} ) + install(FILES qsci_smoke.h DESTINATION include/smoke/qsci) + + FOREACH(incname ${QT_INCLUDES} ${QSCINTILLA_INCLUDE_DIR}) +Index: smoke/soprano/CMakeLists.txt +=================================================================== +--- smoke/soprano/CMakeLists.txt (Revision 813503) ++++ smoke/soprano/CMakeLists.txt (Revision 813529) +@@ -72,7 +72,7 @@ + + set_target_properties(smokesoprano PROPERTIES VERSION 2.0.0 SOVERSION 2 ) + +-install(TARGETS smokesoprano DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ) ++install(TARGETS smokesoprano DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} ) + install(FILES soprano_smoke.h DESTINATION include/smoke/soprano) + + FOREACH(incname ${QT_INCLUDES} ${SOPRANO_INCLUDE_DIR}) Index: smoke/qt/CMakeLists.txt =================================================================== --- smoke/qt/CMakeLists.txt (Revision 813503) -+++ smoke/qt/CMakeLists.txt (Revision 813504) ++++ smoke/qt/CMakeLists.txt (Revision 813529) @@ -144,7 +144,7 @@ # Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is @@ -11,3 +50,16 @@ Index: smoke/qt/CMakeLists.txt install(FILES qt_smoke.h DESTINATION include/smoke/qt) configure_file(qtguess.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl @ONLY) +Index: smoke/qwt/CMakeLists.txt +=================================================================== +--- smoke/qwt/CMakeLists.txt (Revision 813503) ++++ smoke/qwt/CMakeLists.txt (Revision 813529) +@@ -70,7 +70,7 @@ + + set_target_properties(smokeqwt PROPERTIES VERSION 2.0.0 SOVERSION 2 ) + +-install(TARGETS smokeqwt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ) ++install(TARGETS smokeqwt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} ) + install(FILES qwt_smoke.h DESTINATION include/smoke/qwt) + + FOREACH(incname ${QT_INCLUDES} ${Qwt5_INCLUDE_DIR}) diff --git a/kdebindings.spec b/kdebindings.spec index 4574cd0..5fca217 100644 --- a/kdebindings.spec +++ b/kdebindings.spec @@ -23,7 +23,9 @@ Patch100: kdebindings-4.0.80-fix-pykde4.patch # upstream patch to fix smokekde build: # http://websvn.kde.org/?view=rev&revision=811755 Patch101: kdebindings-4.0.80-fix-smokekde.patch -# use lib64 correctly: http://websvn.kde.org/?view=rev&revision=813504 +# use lib64 correctly: +# http://websvn.kde.org/?view=rev&revision=813504 +# http://websvn.kde.org/?view=rev&revision=813529 Patch102: kdebindings-4.0.80-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)