rpms/kdebindings/devel kdebindings-4.0.83-ruby-cmakelists.patch, NONE, 1.1 kdebindings.spec, 1.116, 1.117

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Sat Jun 21 15:12:51 UTC 2008 

Author: kkofler

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

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.0.83-ruby-cmakelists.patch 
Log Message:
* Fri Jun 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-3
- reenable ruby again
- add missing Epoch for minimum kdegraphics-devel version requirement
- fix CMake target name conflict between Ruby and Python bindings

kdebindings-4.0.83-ruby-cmakelists.patch:

--- NEW FILE kdebindings-4.0.83-ruby-cmakelists.patch ---
diff -ur kdebindings-4.0.83/ruby/akonadi/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/akonadi/CMakeLists.txt
--- kdebindings-4.0.83/ruby/akonadi/CMakeLists.txt	2008-06-10 13:40:53.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/akonadi/CMakeLists.txt	2008-06-21 17:03:44.000000000 +0200
@@ -1,10 +1,10 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES} ${KDE4_INCLUDE_DIR})
 
-set(akonadi_LIBRARY_SRC akonadi.cpp akonadihandlers.cpp)
+set(rubyakonadi_LIBRARY_SRC akonadi.cpp akonadihandlers.cpp)
 
-add_library(akonadi MODULE ${akonadi_LIBRARY_SRC})
-target_link_libraries(akonadi ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokeakonadi qtruby4shared)
-set_target_properties(akonadi PROPERTIES PREFIX "")
-install(TARGETS akonadi DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+add_library(rubyakonadi MODULE ${rubyakonadi_LIBRARY_SRC})
+target_link_libraries(rubyakonadi ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokeakonadi qtruby4shared)
+set_target_properties(rubyakonadi PROPERTIES PREFIX "" OUTPUT_NAME akonadi)
+install(TARGETS rubyakonadi DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES akonadi.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/akonadi)
diff -ur kdebindings-4.0.83/ruby/kdevplatform/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/kdevplatform/CMakeLists.txt
--- kdebindings-4.0.83/ruby/kdevplatform/CMakeLists.txt	2008-06-10 13:40:53.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/kdevplatform/CMakeLists.txt	2008-06-21 17:03:48.000000000 +0200
@@ -15,16 +15,16 @@
     ${KDEVPLATFORM_INCLUDE_DIR}/language/duchain/viewer)
 
 
-set(kdevplatform_LIBRARY_SRC kdevplatform.cpp kdevplatformhandlers.cpp)
+set(rubykdevplatform_LIBRARY_SRC kdevplatform.cpp kdevplatformhandlers.cpp)
 
-add_library(kdevplatform MODULE ${kdevplatform_LIBRARY_SRC})
-target_link_libraries(kdevplatform 
+add_library(rubykdevplatform MODULE ${rubykdevplatform_LIBRARY_SRC})
+target_link_libraries(rubykdevplatform 
     ${RUBY_LIBRARY} 
     smokeqt 
     smokekde 
     smokektexteditor
     smokekdevplatform 
     qtruby4shared)
-set_target_properties(kdevplatform PROPERTIES PREFIX "")
-install(TARGETS kdevplatform DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+set_target_properties(rubykdevplatform PROPERTIES PREFIX "" OUTPUT_NAME kdevplatform)
+install(TARGETS rubykdevplatform DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES kdevplatform.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/kdevplatform)
diff -ur kdebindings-4.0.83/ruby/khtml/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/khtml/CMakeLists.txt
--- kdebindings-4.0.83/ruby/khtml/CMakeLists.txt	2008-06-10 13:40:53.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/khtml/CMakeLists.txt	2008-06-21 17:03:52.000000000 +0200
@@ -1,8 +1,8 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 
-set(khtml_LIBRARY_SRC khtml.cpp khtmlhandlers.cpp)
-add_library(khtml MODULE ${khtml_LIBRARY_SRC})
-target_link_libraries(khtml ${KHTML_LIBS} ${RUBY_LIBRARY} smokeqt smokekde smokekhtml qtruby4shared)
-set_target_properties(khtml PROPERTIES PREFIX "")
-install(TARGETS khtml DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+set(rubykhtml_LIBRARY_SRC khtml.cpp khtmlhandlers.cpp)
+add_library(rubykhtml MODULE ${rubykhtml_LIBRARY_SRC})
+target_link_libraries(rubykhtml ${KHTML_LIBS} ${RUBY_LIBRARY} smokeqt smokekde smokekhtml qtruby4shared)
+set_target_properties(rubykhtml PROPERTIES PREFIX "" OUTPUT_NAME khtml)
+install(TARGETS rubykhtml DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES khtml.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/khtml)
diff -ur kdebindings-4.0.83/ruby/ktexteditor/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/ktexteditor/CMakeLists.txt
--- kdebindings-4.0.83/ruby/ktexteditor/CMakeLists.txt	2008-06-10 13:40:53.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/ktexteditor/CMakeLists.txt	2008-06-21 17:03:56.000000000 +0200
@@ -1,10 +1,10 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
-set(ktexteditor_LIBRARY_SRC ktexteditor.cpp ktexteditorhandlers.cpp)
+set(rubyktexteditor_LIBRARY_SRC ktexteditor.cpp ktexteditorhandlers.cpp)
 
-add_library(ktexteditor MODULE ${ktexteditor_LIBRARY_SRC})
-target_link_libraries(ktexteditor ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokektexteditor qtruby4shared)
-set_target_properties(ktexteditor PROPERTIES PREFIX "")
-install(TARGETS ktexteditor DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+add_library(rubyktexteditor MODULE ${rubyktexteditor_LIBRARY_SRC})
+target_link_libraries(rubyktexteditor ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokektexteditor qtruby4shared)
+set_target_properties(rubyktexteditor PROPERTIES PREFIX "" OUTPUT_NAME ktexteditor)
+install(TARGETS rubyktexteditor DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES ktexteditor.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/ktexteditor)
diff -ur kdebindings-4.0.83/ruby/nepomuk/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/nepomuk/CMakeLists.txt
--- kdebindings-4.0.83/ruby/nepomuk/CMakeLists.txt	2008-06-10 13:40:53.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/nepomuk/CMakeLists.txt	2008-06-21 17:04:00.000000000 +0200
@@ -1,10 +1,10 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
-set(nepomuk_LIBRARY_SRC nepomuk.cpp nepomukhandlers.cpp)
+set(rubynepomuk_LIBRARY_SRC nepomuk.cpp nepomukhandlers.cpp)
 
-add_library(nepomuk MODULE ${nepomuk_LIBRARY_SRC})
-target_link_libraries(nepomuk 
+add_library(rubynepomuk MODULE ${rubynepomuk_LIBRARY_SRC})
+target_link_libraries(rubynepomuk 
     ${RUBY_LIBRARY} 
     ${NEPOMUK_LIBRARIES}
     smokeqt 
@@ -12,6 +12,6 @@
     smokekde 
     smokenepomuk 
     qtruby4shared)
-set_target_properties(nepomuk PROPERTIES PREFIX "")
-install(TARGETS nepomuk DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+set_target_properties(rubynepomuk PROPERTIES PREFIX "" OUTPUT_NAME nepomuk)
+install(TARGETS rubynepomuk DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES nepomuk.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/nepomuk)
diff -ur kdebindings-4.0.83/ruby/okular/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/okular/CMakeLists.txt
--- kdebindings-4.0.83/ruby/okular/CMakeLists.txt	2008-06-10 13:40:53.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/okular/CMakeLists.txt	2008-06-21 17:04:04.000000000 +0200
@@ -1,10 +1,10 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
-set(okular_LIBRARY_SRC okular.cpp okularhandlers.cpp)
+set(rubyokular_LIBRARY_SRC okular.cpp okularhandlers.cpp)
 
-add_library(okular MODULE ${okular_LIBRARY_SRC})
-target_link_libraries(okular ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokeokular qtruby4shared)
-set_target_properties(okular PROPERTIES PREFIX "")
-install(TARGETS okular DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+add_library(rubyokular MODULE ${rubyokular_LIBRARY_SRC})
+target_link_libraries(rubyokular ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokekde smokeokular qtruby4shared)
+set_target_properties(rubyokular PROPERTIES PREFIX "" OUTPUT_NAME okular)
+install(TARGETS rubyokular DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES okular.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/okular)
diff -ur kdebindings-4.0.83/ruby/phonon/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/phonon/CMakeLists.txt
--- kdebindings-4.0.83/ruby/phonon/CMakeLists.txt	2008-06-10 13:40:53.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/phonon/CMakeLists.txt	2008-06-21 17:04:08.000000000 +0200
@@ -2,9 +2,9 @@
 
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 
-set(phonon_LIBRARY_SRC phonon.cpp phononhandlers.cpp)
-add_library(phonon MODULE ${phonon_LIBRARY_SRC})
-target_link_libraries(phonon ${PHONON_LIBS} ${RUBY_LIBRARY} smokeqt smokephonon qtruby4shared)
-set_target_properties(phonon PROPERTIES PREFIX "")
-install(TARGETS phonon DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+set(rubyphonon_LIBRARY_SRC phonon.cpp phononhandlers.cpp)
+add_library(rubyphonon MODULE ${rubyphonon_LIBRARY_SRC})
+target_link_libraries(rubyphonon ${PHONON_LIBS} ${RUBY_LIBRARY} smokeqt smokephonon qtruby4shared)
+set_target_properties(rubyphonon PROPERTIES PREFIX "" OUTPUT_NAME phonon)
+install(TARGETS rubyphonon DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES phonon.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/phonon)
diff -ur kdebindings-4.0.83/ruby/qscintilla/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/qscintilla/CMakeLists.txt
--- kdebindings-4.0.83/ruby/qscintilla/CMakeLists.txt	2008-06-03 11:34:10.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/qscintilla/CMakeLists.txt	2008-06-21 17:04:58.000000000 +0200
@@ -1,9 +1,9 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
-set(qsci_LIBRARY_SRC qscintilla.cpp qscintillahandlers.cpp)
-add_library(qscintilla MODULE ${qsci_LIBRARY_SRC})
-target_link_libraries(qscintilla ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqsci qtruby4shared)
-set_target_properties(qscintilla PROPERTIES PREFIX "")
-install(TARGETS qscintilla DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+set(rubyqsci_LIBRARY_SRC qscintilla.cpp qscintillahandlers.cpp)
+add_library(rubyqscintilla MODULE ${rubyqsci_LIBRARY_SRC})
+target_link_libraries(rubyqscintilla ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqsci qtruby4shared)
+set_target_properties(rubyqscintilla PROPERTIES PREFIX "" OUTPUT_NAME qscintilla)
+install(TARGETS rubyqscintilla DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES qscintilla.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qscintilla)
diff -ur kdebindings-4.0.83/ruby/qtuitools/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/qtuitools/CMakeLists.txt
--- kdebindings-4.0.83/ruby/qtuitools/CMakeLists.txt	2008-06-10 13:40:53.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/qtuitools/CMakeLists.txt	2008-06-21 17:05:30.000000000 +0200
@@ -1,9 +1,9 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
-set(qtuitools_LIBRARY_SRC qtuitools.cpp qtuitoolshandlers.cpp)
-add_library(qtuitools MODULE ${qtuitools_LIBRARY_SRC})
-target_link_libraries(qtuitools ${RUBY_LIBRARY} smokeqt smokeqtuitools qtruby4shared)
-set_target_properties(qtuitools PROPERTIES PREFIX "")
-install(TARGETS qtuitools DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+set(rubyqtuitools_LIBRARY_SRC qtuitools.cpp qtuitoolshandlers.cpp)
+add_library(rubyqtuitools MODULE ${rubyqtuitools_LIBRARY_SRC})
+target_link_libraries(rubyqtuitools ${RUBY_LIBRARY} smokeqt smokeqtuitools qtruby4shared)
+set_target_properties(rubyqtuitools PROPERTIES PREFIX "" OUTPUT_NAME qtuitools)
+install(TARGETS rubyqtuitools DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES qtuitools.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qtuitools)
diff -ur kdebindings-4.0.83/ruby/qtwebkit/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/qtwebkit/CMakeLists.txt
--- kdebindings-4.0.83/ruby/qtwebkit/CMakeLists.txt	2008-06-10 13:40:53.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/qtwebkit/CMakeLists.txt	2008-06-21 17:05:55.000000000 +0200
@@ -1,9 +1,9 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
-set(qtwebkit_LIBRARY_SRC qtwebkit.cpp qtwebkithandlers.cpp)
-add_library(qtwebkit MODULE ${qtwebkit_LIBRARY_SRC})
-target_link_libraries(qtwebkit ${QT_QTWEBKIT_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqtwebkit qtruby4shared)
-set_target_properties(qtwebkit PROPERTIES PREFIX "")
-install(TARGETS qtwebkit DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+set(rubyqtwebkit_LIBRARY_SRC qtwebkit.cpp qtwebkithandlers.cpp)
+add_library(rubyqtwebkit MODULE ${rubyqtwebkit_LIBRARY_SRC})
+target_link_libraries(rubyqtwebkit ${QT_QTWEBKIT_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqtwebkit qtruby4shared)
+set_target_properties(rubyqtwebkit PROPERTIES PREFIX "" OUTPUT_NAME qtwebkit)
+install(TARGETS rubyqtwebkit DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES qtwebkit.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qtwebkit)
diff -ur kdebindings-4.0.83/ruby/qwt/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/qwt/CMakeLists.txt
--- kdebindings-4.0.83/ruby/qwt/CMakeLists.txt	2008-06-03 11:34:11.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/qwt/CMakeLists.txt	2008-06-21 17:06:25.000000000 +0200
@@ -1,9 +1,9 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
-set(qsci_LIBRARY_SRC qwt.cpp qwthandlers.cpp)
-add_library(qwt MODULE ${qsci_LIBRARY_SRC})
-target_link_libraries(qwt ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqwt qtruby4shared)
-set_target_properties(qwt PROPERTIES PREFIX "")
-install(TARGETS qwt DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+set(rubyqwt_LIBRARY_SRC qwt.cpp qwthandlers.cpp)
+add_library(rubyqwt MODULE ${rubyqwt_LIBRARY_SRC})
+target_link_libraries(rubyqwt ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokeqwt qtruby4shared)
+set_target_properties(rubyqwt PROPERTIES PREFIX "" OUTPUT_NAME qwt)
+install(TARGETS rubyqwt DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES qwt.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/qwt)
diff -ur kdebindings-4.0.83/ruby/solid/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/solid/CMakeLists.txt
--- kdebindings-4.0.83/ruby/solid/CMakeLists.txt	2008-06-10 13:40:53.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/solid/CMakeLists.txt	2008-06-21 17:06:55.000000000 +0200
@@ -1,16 +1,16 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES} ${KDE4_INCLUDE_DIR})
 
-set(solid_LIBRARY_SRC solid.cpp solidhandlers.cpp)
+set(rubysolid_LIBRARY_SRC solid.cpp solidhandlers.cpp)
 
-add_library(solid MODULE ${solid_LIBRARY_SRC})
-target_link_libraries(solid 
+add_library(rubysolid MODULE ${rubysolid_LIBRARY_SRC})
+target_link_libraries(rubysolid 
     ${QT_QTCORE_LIBRARY} 
     ${RUBY_LIBRARY} 
     ${KDE4_SOLID_LIBS}
     smokeqt 
     smokesolid 
     qtruby4shared)
-set_target_properties(solid PROPERTIES PREFIX "")
-install(TARGETS solid DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+set_target_properties(rubysolid PROPERTIES PREFIX "" OUTPUT_NAME solid)
+install(TARGETS rubysolid DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES solid.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/solid)
diff -ur kdebindings-4.0.83/ruby/soprano/CMakeLists.txt kdebindings-4.0.83-ruby-cmakelists/ruby/soprano/CMakeLists.txt
--- kdebindings-4.0.83/ruby/soprano/CMakeLists.txt	2008-05-21 10:32:32.000000000 +0200
+++ kdebindings-4.0.83-ruby-cmakelists/ruby/soprano/CMakeLists.txt	2008-06-21 17:07:28.000000000 +0200
@@ -1,9 +1,9 @@
 include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/ruby/qtruby/src)
 INCLUDE_DIRECTORIES (${QT_INCLUDES})
 
-set(soprano_LIBRARY_SRC soprano.cpp sopranohandlers.cpp)
-add_library(soprano MODULE ${soprano_LIBRARY_SRC})
-target_link_libraries(soprano ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokesoprano qtruby4shared)
-set_target_properties(soprano PROPERTIES PREFIX "")
-install(TARGETS soprano DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
+set(rubysoprano_LIBRARY_SRC soprano.cpp sopranohandlers.cpp)
+add_library(rubysoprano MODULE ${rubysoprano_LIBRARY_SRC})
+target_link_libraries(rubysoprano ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} smokeqt smokesoprano qtruby4shared)
+set_target_properties(rubysoprano PROPERTIES PREFIX "" OUTPUT_NAME soprano)
+install(TARGETS rubysoprano DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
 install(FILES soprano.rb DESTINATION ${CUSTOM_RUBY_SITE_LIB_DIR}/soprano)


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- kdebindings.spec	20 Jun 2008 18:37:14 -0000	1.116
+++ kdebindings.spec	21 Jun 2008 15:12:06 -0000	1.117
@@ -3,7 +3,7 @@
 # in e.g. the whole Ruby, OpenJDK and Mono stacks for a PyKDE app! -- Kevin
 
 # define to enable these optional bits
-#define ruby 1
+%define ruby 1
 %define smoke 1
 %define devel 1
 #define php 1
@@ -16,19 +16,21 @@
 
 Name: kdebindings
 Version: 4.0.83
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# fix CMake target name conflict between Ruby and Python bindings
+Patch0: kdebindings-4.0.83-ruby-cmakelists.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
-BuildRequires:  kdegraphics-devel >= %{version}
+BuildRequires:  kdegraphics-devel >= 7:%{version}
 BuildRequires:  soprano-devel >= 2.0.97
 BuildRequires:  cmake
 # FIMXE:TODO: disabled for now
@@ -82,6 +84,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .ruby-cmakelists
 
 
 %build
@@ -164,6 +167,11 @@
 
 
 %changelog
+* Fri Jun 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-3
+- reenable ruby again
+- add missing Epoch for minimum kdegraphics-devel version requirement
+- fix CMake target name conflict between Ruby and Python bindings
+
 * Fri Jun 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.83-2
 - reenable smoke again (keep ruby off for now)
 - drop explicit ENABLE_SMOKEKDEVPLATFORM=OFF (now off by default)

More information about the fedora-extras-commits mailing list