rpms/kdebindings/devel kdebindings-4.0.80-lib64.patch, NONE, 1.1 kdebindings.spec, 1.103, 1.104

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.0.80-lib64.patch 
Log Message:
- update file lists (disable smokeplasma, add new smoke/ruby files)

kdebindings-4.0.80-lib64.patch:

--- NEW FILE kdebindings-4.0.80-lib64.patch ---
Index: smoke/qt/CMakeLists.txt
===================================================================
--- smoke/qt/CMakeLists.txt	(Revision 804510)
+++ smoke/qt/CMakeLists.txt	(Revision 804509)
@@ -138,9 +138,7 @@
 
 set_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
 
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
+install(TARGETS smokeqt DESTINATION ${LIB_INSTALL_DIR} )
 
 configure_file(qtguess.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/qtguess.pl @ONLY)
 configure_file(generate.pl.cmake ${CMAKE_CURRENT_BINARY_DIR}/generate.pl @ONLY )


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdebindings.spec	27 May 2008 20:27:49 -0000	1.103
+++ kdebindings.spec	27 May 2008 21:13:25 -0000	1.104
@@ -17,6 +17,9 @@
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# revert http://websvn.kde.org/?view=rev&revision=804510
+# This uses /usr/lib instead of /usr/lib64 as libdir on x86_64/ppc64.
+Patch0: kdebindings-4.0.80-lib64.patch
 # upstream patch to fix PyKDE4 build:
 # http://websvn.kde.org/?view=rev&revision=811888
 Patch100: kdebindings-4.0.80-fix-pykde4.patch
@@ -69,6 +72,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .lib64
 %patch100 -p0 -b .fix-pykde4
 %patch101 -p0 -b .fix-smokekde
 # get rid of this because it breaks the build without PHP
@@ -108,32 +112,41 @@
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_kde4_bindir}/*
 %{_kde4_libdir}/lib*.so.*
+# unversioned library
+%{_kde4_libdir}/libqtruby4shared.so
 %{_kde4_libdir}/kde4/*.so
 %{ruby_sitelib}/KDE/
 %{ruby_sitelib}/Qt.rb
 %{ruby_sitelib}/Qt/
 %{ruby_sitelib}/Qt3.rb
 %{ruby_sitelib}/Qt4.rb
+%{ruby_sitelib}/QScintilla.rb
+%{ruby_sitelib}/Qsci/
 %{ruby_sitearch}/*.so
 %{python_sitearch}/PyKDE4/
 %{_kde4_appsdir}/pykde4/
 %{_kde4_datadir}/applications/kde4/dbpedia_references.desktop
 %{_kde4_appsdir}/dbpedia_references/
-%{_kde4_appsdir}/plasma-*/
-%{_kde4_datadir}/kde4/services/plasma-*.desktop
+# These are currently not built:
+#%{_kde4_appsdir}/plasma-*/
+#%{_kde4_datadir}/kde4/services/plasma-*.desktop
 
 %files devel
 %defattr(-,root,root,-)
 %doc %{_kde4_docdir}/HTML/PyKDE4/
 %{_includedir}/smoke.h
+%{_includedir}/qtruby/
+%{_includedir}/smoke/
 %{_kde4_datadir}/sip/PyKDE4/
 %{_kde4_libdir}/lib*.so
+%exclude %{_kde4_libdir}/libqtruby4shared.so
 
 
 %changelog
 * Tue May 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-2
 - disable php-qt for now
 - apply PyKDE4 and smokekde build fixes from upstream
+- update file lists (comment out smokeplasma, add new smoke/ruby files)
 
 * Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
 - 4.1 beta1