rpms/kdebindings/devel kdebindings-4.3.95-fix_smokekde.patch, NONE, 1.1 kdebindings.spec, 1.293, 1.294
Rex Dieter
rdieter at fedoraproject.org
Sat Jan 23 23:36:21 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12074
Modified Files:
kdebindings.spec
Added Files:
kdebindings-4.3.95-fix_smokekde.patch
Log Message:
try patch posted to kde-packagers list
kdebindings-4.3.95-fix_smokekde.patch:
akonadi/CMakeLists.txt | 3 ++-
khtml/CMakeLists.txt | 2 +-
ktexteditor/CMakeLists.txt | 3 ++-
nepomuk/CMakeLists.txt | 3 ++-
okular/CMakeLists.txt | 3 ++-
5 files changed, 9 insertions(+), 5 deletions(-)
--- NEW FILE kdebindings-4.3.95-fix_smokekde.patch ---
diff -uar kdebindings-4.3.95.orig/ruby/akonadi/CMakeLists.txt kdebindings-4.3.95/ruby/akonadi/CMakeLists.txt
--- kdebindings-4.3.95.orig/ruby/akonadi/CMakeLists.txt 2009-12-31 14:35:16.000000000 +0100
+++ kdebindings-4.3.95/ruby/akonadi/CMakeLists.txt 2010-01-23 23:05:23.000000000 +0100
@@ -11,7 +11,8 @@
${KDEPIMLIBS_AKONADI_LIBS}
${KDEPIMLIBS_AKONADI_KMIME_LIBS}
smokeqt
- smokekde
+ smokekdecore
+ smokekdeui
smokeakonadi
qtruby4shared)
set_target_properties(rubyakonadi PROPERTIES PREFIX "" OUTPUT_NAME akonadi)
diff -uar kdebindings-4.3.95.orig/ruby/khtml/CMakeLists.txt kdebindings-4.3.95/ruby/khtml/CMakeLists.txt
--- kdebindings-4.3.95.orig/ruby/khtml/CMakeLists.txt 2009-12-31 14:34:50.000000000 +0100
+++ kdebindings-4.3.95/ruby/khtml/CMakeLists.txt 2010-01-23 23:04:49.000000000 +0100
@@ -2,7 +2,7 @@
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)
+target_link_libraries(rubykhtml ${KHTML_LIBS} ${RUBY_LIBRARY} smokeqt smokekdecore 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 -uar kdebindings-4.3.95.orig/ruby/ktexteditor/CMakeLists.txt kdebindings-4.3.95/ruby/ktexteditor/CMakeLists.txt
--- kdebindings-4.3.95.orig/ruby/ktexteditor/CMakeLists.txt 2009-12-31 14:35:16.000000000 +0100
+++ kdebindings-4.3.95/ruby/ktexteditor/CMakeLists.txt 2010-01-23 23:04:20.000000000 +0100
@@ -8,7 +8,8 @@
${QT_QTCORE_LIBRARY}
${RUBY_LIBRARY}
smokeqt
- smokekde
+ smokekdecore
+ smokekdeui
smokektexteditor
qtruby4shared)
set_target_properties(rubyktexteditor PROPERTIES PREFIX "" OUTPUT_NAME ktexteditor)
diff -uar kdebindings-4.3.95.orig/ruby/nepomuk/CMakeLists.txt kdebindings-4.3.95/ruby/nepomuk/CMakeLists.txt
--- kdebindings-4.3.95.orig/ruby/nepomuk/CMakeLists.txt 2009-12-31 14:35:17.000000000 +0100
+++ kdebindings-4.3.95/ruby/nepomuk/CMakeLists.txt 2010-01-23 23:03:03.000000000 +0100
@@ -9,7 +9,8 @@
${NEPOMUK_LIBRARIES}
smokeqt
smokesoprano
- smokekde
+ smokekdecore
+ smokekdeui
smokenepomuk
qtruby4shared)
set_target_properties(rubynepomuk PROPERTIES PREFIX "" OUTPUT_NAME nepomuk)
diff -uar kdebindings-4.3.95.orig/ruby/okular/CMakeLists.txt kdebindings-4.3.95/ruby/okular/CMakeLists.txt
--- kdebindings-4.3.95.orig/ruby/okular/CMakeLists.txt 2009-12-31 14:35:09.000000000 +0100
+++ kdebindings-4.3.95/ruby/okular/CMakeLists.txt 2010-01-23 23:03:41.000000000 +0100
@@ -9,7 +9,8 @@
${RUBY_LIBRARY}
${OKULAR_LIBRARIES}
smokeqt
- smokekde
+ smokekdecore
+ smokekdeui
smokeokular
qtruby4shared)
set_target_properties(rubyokular PROPERTIES PREFIX "" OUTPUT_NAME okular)
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- kdebindings.spec 21 Jan 2010 13:55:02 -0000 1.293
+++ kdebindings.spec 23 Jan 2010 23:36:19 -0000 1.294
@@ -71,6 +71,7 @@ Patch0: kdebindings-4.3.85-qyoto_no_exa
# commit this upstream without further discussion.
Patch1: kdebindings-4.3.75-no-rpath.patch
## upstream patches
+Patch50: kdebindings-4.3.95-fix_smokekde.patch
BuildRequires: akonadi-devel >= %{akonadi_version}
BuildRequires: kdebase-workspace-devel >= %{version}
@@ -291,6 +292,8 @@ sed -i -e 's!COMMAND generator!COMMAND $
%global _cmake_skip_rpath %{nil}
%endif
+%patch50 -p1 -b .fix_smokekde
+
%build
mkdir -p %{_target_platform}
More information about the scm-commits
mailing list