rpms/kdebindings/devel kdebindings-3.5.6-python25.patch, NONE, 1.1 kdebindings.spec, 1.62, 1.63 sources, 1.33, 1.34 kde-libtool.patch, 1.1, NONE kdebindings-3.5.5-automake1.10.patch, 1.1, NONE kdebindings-3.5.5-type.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebindings/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30507

Modified Files:
	kdebindings.spec sources 
Added Files:
	kdebindings-3.5.6-python25.patch 
Removed Files:
	kde-libtool.patch kdebindings-3.5.5-automake1.10.patch 
	kdebindings-3.5.5-type.patch 
Log Message:
3.5.6


kdebindings-3.5.6-python25.patch:
 marshaller.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE kdebindings-3.5.6-python25.patch ---
Index: dcoppython/shell/marshaller.cpp
===================================================================
--- dcoppython/shell/marshaller.cpp	(Revision 626831)
+++ dcoppython/shell/marshaller.cpp	(Revision 626832)
@@ -24,6 +24,10 @@
 
 #include <kurl.h>
 
+#if PY_VERSION_HEX < 0x02050000
+typedef int Py_ssize_t;
+#endif
+
 namespace PythonDCOP {
 
 #include "marshal_funcs.h"
@@ -124,7 +128,7 @@
     if (!PyDict_Check(obj)) return false;
 
 
-    ssize_t c=0;
+    Py_ssize_t c=0;
     PyObject *key, *val;
     while (PyDict_Next(obj, &c, &key, &val)==1)
       if (!key_type.isMarshallable(key) ||


Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kdebindings.spec	14 Dec 2006 09:25:52 -0000	1.62
+++ kdebindings.spec	7 Feb 2007 23:38:50 -0000	1.63
@@ -3,8 +3,10 @@
 
 %define appdir %{_datadir}/applications/kde
 
+%{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
+
 %define qt_version 3.3.7
-%define arts_version 1.5.5
+%define arts_version 1.5.6
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
 %define perlver 5.8
@@ -17,8 +19,8 @@
 %define ruby 1
 %define pyqt 0
 
-Version: 3.5.5
-Release: 4%{?dist}
+Version: 3.5.6
+Release: 1%{?dist}
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
 URL: http://www.kde.org/
@@ -31,8 +33,9 @@
 Patch6: kdebindings-3.1-python2.5.patch
 Patch8: kdebindings-3.3.0-python.patch
 Patch9: kdebindings-3.3.92-xdg.patch
-Patch10: kdebindings-3.5.5-automake1.10.patch
-Patch11: kdebindings-3.5.5-type.patch
+
+# upstream patches
+Patch100: kdebindings-3.5.6-python25.patch
 
 BuildRequires: zlib-devel
 BuildRequires: kdelibs-devel
@@ -50,7 +53,9 @@
 %endif
 
 %if %{python}
-BuildRequires: python python-devel
+BuildRequires: python >= %{pythonver}
+BuildRequires: python-devel >= %{pythonver}
+Requires: python-abi = %{pythonver}
 %endif
 
 %if %{ruby}
@@ -92,6 +97,7 @@
 Summary: Python bindings to DCOP
 Group: Development/Libraries
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: python-abi = %{pythonver}
 
 %description python
 Python bindings to the DCOP interprocess communication protocol used by KDE
@@ -107,8 +113,7 @@
 rm -rf python
 %endif
 %patch9 -p1 -b .xdg
-%patch10 -p1 -b .automake
-%patch11 -p1 -b .pyssizet
+%patch100 -p0 -b .python25
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
@@ -198,6 +203,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Thu Feb 08 2007  Than Ngo <than at redhat.com> - 3.5.6-1.fc7
+- 3.5.6
+
 * Thu Dec 14 2006 Karsten Hopp <karsten at redhat.com> 3.5.5-4
 - use correct types
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	14 Nov 2006 14:27:54 -0000	1.33
+++ sources	7 Feb 2007 23:38:50 -0000	1.34
@@ -1 +1 @@
-e0da219943407a786c2ceea1605fadd1  kdebindings-3.5.5.tar.bz2
+d26b5f54f062b765a949d66657c2ab3c  kdebindings-3.5.6.tar.bz2


--- kde-libtool.patch DELETED ---


--- kdebindings-3.5.5-automake1.10.patch DELETED ---


--- kdebindings-3.5.5-type.patch DELETED ---