rpms/kdebindings/devel kdebindings-3.97.0-libsmokeqt-lib64.patch, NONE, 1.1 kdebindings.spec, 1.72, 1.73

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-3.97.0-libsmokeqt-lib64.patch 
Log Message:
* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-2
- remove X11 BRs now Required by kdelibs-devel
- add BR: qwt-devel
- fix libsmokeqt being in /usr/lib even on 64-bit arches
- use ruby_sitelib and ruby_sitearch properly

kdebindings-3.97.0-libsmokeqt-lib64.patch:

--- NEW FILE kdebindings-3.97.0-libsmokeqt-lib64.patch ---
diff -ur kdebindings-3.97.0/smoke/qt/CMakeLists.txt kdebindings-3.97.0-libsmokeqt-lib64/smoke/qt/CMakeLists.txt
--- kdebindings-3.97.0/smoke/qt/CMakeLists.txt	2007-10-16 16:49:23.000000000 +0200
+++ kdebindings-3.97.0-libsmokeqt-lib64/smoke/qt/CMakeLists.txt	2007-12-11 07:37:59.000000000 +0100
@@ -90,8 +90,8 @@
                 ${CMAKE_CURRENT_BINARY_DIR}/x_20.cpp
 )
 
-# kde4_add_library(smokeqt SHARED ${smokeqt_LIB_SRCS})
-add_library(smokeqt SHARED ${smokeqt_LIB_SRCS})
+kde4_add_library(smokeqt SHARED ${smokeqt_LIB_SRCS})
+# add_library(smokeqt SHARED ${smokeqt_LIB_SRCS})
 
 SET(QT_USE_QTNETWORK ${QT_QTNETWORK_FOUND})
 SET(QT_USE_QTOPENGL ${QT_QTOPENGL_FOUND})


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kdebindings.spec	10 Dec 2007 21:23:47 -0000	1.72
+++ kdebindings.spec	11 Dec 2007 07:05:03 -0000	1.73
@@ -1,29 +1,27 @@
+%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
+%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+
 Name: kdebindings
 Version: 3.97.0
-Release: 1%{?dist}
+Release: 2%{?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
+Patch0: kdebindings-3.97.0-libsmokeqt-lib64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # FIXME/TODO: missing BRs (taken from CMakeCache.txt)
 #QSCINTILLA_INCLUDE_DIR:PATH=QSCINTILLA_INCLUDE_DIR-NOTFOUND
 #QSCINTILLA_LIBRARY:FILEPATH=QSCINTILLA_LIBRARY-NOTFOUND
-#QT_QTMOTIF_INCLUDE_DIR:PATH=QT_QTMOTIF_INCLUDE_DIR-NOTFOUND
-#QT_QTMOTIF_LIBRARY:FILEPATH=QT_QTMOTIF_LIBRARY-NOTFOUND
-#QT_QTNSPLUGIN_INCLUDE_DIR:PATH=QT_QTNSPLUGIN_INCLUDE_DIR-NOTFOUND
-#QT_QTNSPLUGIN_LIBRARY:FILEPATH=QT_QTNSPLUGIN_LIBRARY-NOTFOUND
-#Qwt5_INCLUDE_DIR:PATH=Qwt5_INCLUDE_DIR-NOTFOUND
+# We currently only have Qt 3 QScintilla.
 
 BuildRequires:  kde-filesystem >= 4
 BuildRequires:  kdelibs4-devel >= %{version}
 BuildRequires:  kdebase-workspace-devel >= %{version}
 BuildRequires:  cmake
-# FIXME/TODO: Is PyKDE already ported to KDE4?
-#BuildRequires:  PyKDE-devel
 # FIMXE:TODO: disabled for now
 #BuildRequires:  mono-core
 BuildRequires:  python-devel
@@ -31,17 +29,7 @@
 BuildRequires:  ruby
 BuildRequires:  giflib-devel
 BuildRequires:  pcre-devel
-
-# Will be in kdelibs4-devel soon, could be removed then
-BuildRequires:  libxkbfile-devel
-BuildRequires:  libXdamage-devel
-BuildRequires:  libXv-devel
-BuildRequires:  libXpm-devel
-BuildRequires:  libXScrnSaver-devel
-BuildRequires:  libXtst-devel
-BuildRequires:  libXpm-devel
-BuildRequires:  libXxf86misc-devel
-BuildRequires:  libXcomposite-devel
+BuildRequires:  qwt-devel
 
 # FIXME/TODO: are there other explicit Requires?
 Requires(post): /sbin/ldconfig 
@@ -62,6 +50,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -69,7 +58,7 @@
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 # FIXME/TODO: Get csharp to compile
-%{cmake_kde4} -DBUILD_csharp=OFF ..
+%{cmake_kde4} -DRUBY_SITE_LIB_DIR=%{ruby_sitelib} -DRUBY_SITE_ARCH_DIR=%{ruby_sitearch} -DBUILD_csharp=OFF ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -112,14 +101,14 @@
 %doc AUTHORS ChangeLog COPYING COPYING.LIB NEWS README
 %{_kde4_bindir}/*
 %{_kde4_libdir}/*.so.*
-%{_kde4_libdir}/ruby/site_ruby/1.8/KDE/korundum4.rb
-%{_kde4_libdir}/ruby/site_ruby/1.8/Qt.rb
-%{_kde4_libdir}/ruby/site_ruby/1.8/Qt/active_item_model.rb
-%{_kde4_libdir}/ruby/site_ruby/1.8/Qt/active_table_model.rb
-%{_kde4_libdir}/ruby/site_ruby/1.8/Qt/qtruby4.rb
-%{_kde4_libdir}/ruby/site_ruby/1.8/Qt3.rb
-%{_kde4_libdir}/ruby/site_ruby/1.8/Qt4.rb
-%{_kde4_libdir}/ruby/site_ruby/1.8/i386-linux/*.so
+%{ruby_sitelib}/KDE/korundum4.rb
+%{ruby_sitelib}/Qt.rb
+%{ruby_sitelib}/Qt/active_item_model.rb
+%{ruby_sitelib}/Qt/active_table_model.rb
+%{ruby_sitelib}/Qt/qtruby4.rb
+%{ruby_sitelib}/Qt3.rb
+%{ruby_sitelib}/Qt4.rb
+%{ruby_sitearch}/*.so
 %{_kde4_libdir}/kde4/*.so
 %exclude %{_kde4_libdir}/kde4/devel/
 
@@ -129,6 +118,12 @@
 %{_kde4_libdir}/kde4/devel/*
 
 %changelog
+* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-2
+- remove X11 BRs now Required by kdelibs-devel
+- add BR: qwt-devel
+- fix libsmokeqt being in /usr/lib even on 64-bit arches
+- use ruby_sitelib and ruby_sitearch properly
+
 * Mon Dec 10 2007 Than Ngo <than at redhat.com> 3.97.0-1
 - 3.97.0