rpms/kdebindings/devel kdebindings-4.0.80-lib64.patch, 1.2, 1.3 kdebindings.spec, 1.106, 1.107

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv995/devel

Modified Files:
	kdebindings-4.0.80-lib64.patch kdebindings.spec 
Log Message:
More lib64 fixes.

kdebindings-4.0.80-lib64.patch:

Index: kdebindings-4.0.80-lib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.0.80-lib64.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebindings-4.0.80-lib64.patch	27 May 2008 22:51:51 -0000	1.2
+++ kdebindings-4.0.80-lib64.patch	27 May 2008 23:21:35 -0000	1.3
@@ -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 @@
  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})


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- kdebindings.spec	27 May 2008 22:51:51 -0000	1.106
+++ kdebindings.spec	27 May 2008 23:21:35 -0000	1.107
@@ -23,7 +23,9 @@
 # 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)