rpms/kdebindings/devel kdebindings-3.97.0-libsmokeqt-lib64.patch, 1.1, 1.2 kdebindings.spec, 1.75, 1.76

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdebindings-3.97.0-libsmokeqt-lib64.patch kdebindings.spec 
Log Message:
* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-4
- rewrite libsmokeqt-lib64 patch so it actually works
- add PyKDE4 files to file list
- specify minimum versions of sip-devel and PyQt4-devel
- require PyQt4 in main package, PyQt4-devel in -devel
- fix unowned Qt and KDE directories under ruby_sitelib

kdebindings-3.97.0-libsmokeqt-lib64.patch:

Index: kdebindings-3.97.0-libsmokeqt-lib64.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-3.97.0-libsmokeqt-lib64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebindings-3.97.0-libsmokeqt-lib64.patch	11 Dec 2007 07:05:03 -0000	1.1
+++ kdebindings-3.97.0-libsmokeqt-lib64.patch	11 Dec 2007 08:55:41 -0000	1.2
@@ -1,14 +1,12 @@
 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
- )
++++ kdebindings-3.97.0-libsmokeqt-lib64/smoke/qt/CMakeLists.txt	2007-12-11 09:39:15.000000000 +0100
+@@ -132,7 +132,7 @@
  
--# 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_target_properties(smokeqt PROPERTIES VERSION 2.0.0 SOVERSION 2 )
  
- SET(QT_USE_QTNETWORK ${QT_QTNETWORK_FOUND})
- SET(QT_USE_QTOPENGL ${QT_QTOPENGL_FOUND})
+-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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- kdebindings.spec	11 Dec 2007 08:22:45 -0000	1.75
+++ kdebindings.spec	11 Dec 2007 08:55:41 -0000	1.76
@@ -1,9 +1,12 @@
 %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
 %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
+%global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
 Version: 3.97.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
@@ -31,8 +34,10 @@
 BuildRequires:  pcre-devel
 # causes smokeqt to fail to build
 #BuildRequires:  qwt-devel
-BuildRequires:  sip-devel
-BuildRequires:  PyQt4-devel
+BuildRequires:  sip-devel >= 4.7.1
+BuildRequires:  PyQt4-devel >= 4.3.1
+
+Requires: PyQt4
 
 # FIXME/TODO: are there other explicit Requires?
 Requires(post): /sbin/ldconfig 
@@ -47,7 +52,7 @@
 Group:    Development/Libraries
 Summary:  Header files for %{name}
 Requires: %{name} = %{version}-%{release}
-Requires: kdelibs4-devel kdebase-workspace-devel
+Requires: kdelibs4-devel kdebase-workspace-devel PyQt4-devel
 %description devel
 Header files for developing applications using %{name}.
 
@@ -104,23 +109,32 @@
 %doc AUTHORS ChangeLog COPYING COPYING.LIB NEWS README
 %{_kde4_bindir}/*
 %{_kde4_libdir}/*.so.*
-%{ruby_sitelib}/KDE/korundum4.rb
+%{ruby_sitelib}/KDE/
 %{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}/Qt/
 %{ruby_sitelib}/Qt3.rb
 %{ruby_sitelib}/Qt4.rb
 %{ruby_sitearch}/*.so
+%{python_sitearch}/PyKDE4/
+%{_kde4_appsdir}/pykde4/
 %{_kde4_libdir}/kde4/*.so
 %exclude %{_kde4_libdir}/kde4/devel/
 
 %files devel
 %defattr(-,root,root,-)
 %{_kde4_includedir}/smoke.h
+%{_kde4_datadir}/sip/PyKDE4/
+%doc %{_kde4_docdir}/HTML/PyKDE4/
 %{_kde4_libdir}/kde4/devel/*
 
 %changelog
+* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-4
+- rewrite libsmokeqt-lib64 patch so it actually works
+- add PyKDE4 files to file list
+- specify minimum versions of sip-devel and PyQt4-devel
+- require PyQt4 in main package, PyQt4-devel in -devel
+- fix unowned Qt and KDE directories under ruby_sitelib
+
 * Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-3
 - omit BR: qwt-devel for now, causes build failure in smokeqt
 - add BRs: sip-devel PyQt4-devel for PyKDE4