rpms/PyKDE/devel PyKDE-3.16.7.patch,NONE,1.1 PyKDE.spec,1.30,1.31

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/PyKDE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14052

Modified Files:
	PyKDE.spec 
Added Files:
	PyKDE-3.16.7.patch 
Log Message:
* Mon Jan 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.16.6-3
- upstream patch to support newew sip


PyKDE-3.16.7.patch:
 global.sip |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

--- NEW FILE PyKDE-3.16.7.patch ---
diff -ru PyKDE-3.16.6/sip/kio/global.sip PyKDE-3.16.7/sip/kio/global.sip
--- PyKDE-3.16.6/sip/kio/global.sip	2009-06-10 22:44:48.000000000 +0100
+++ PyKDE-3.16.7/sip/kio/global.sip	2010-01-25 09:47:39.410088826 +0000
@@ -477,20 +477,7 @@
 %MethodCode
 //takes dict | (KIO.MetaData)
 //returns (KIO.MetaData)
-
-
-    PyObject *dict;
-    if (sipParseArgs(&sipArgsParsed,sipArgs,"T", &PyDict_Type, &dict))
-    {
-        int isErr = 0;
-        KIO::MetaData *map = (KIO::MetaData *)sipForceConvertToType(dict, sipType_KIO_MetaData, NULL, SIP_NO_CONVERTORS, NULL, &isErr);
-        if (isErr)
-        {
-            Py_INCREF (Py_None);
-            return Py_None;
-        }
-        return sipConvertFromType(map, sipType_KIO_MetaData, NULL);
-    }
+    sipRes = a0;
 %End
 
 //end


Index: PyKDE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- PyKDE.spec	7 Jan 2010 22:22:56 -0000	1.30
+++ PyKDE.spec	25 Jan 2010 14:31:30 -0000	1.31
@@ -13,7 +13,7 @@ BuildRequires: libutempter-devel
 Summary: Python bindings for KDE3
 Name: 	 PyKDE
 Version: 3.16.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL: 	 http://www.riverbankcomputing.com/software/pykde/intro 
@@ -25,6 +25,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch2: PyKDE-3.16.0-kmimetype.patch
 
 ## upstream patches
+# candidate to fix build with latest sip
+Patch100: PyKDE-3.16.7.patch
 
 BuildRequires: python-devel >= 2.3
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
@@ -60,6 +62,7 @@ Sip files and documentation needed for d
 %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}}
 
 %patch2 -p1 -b .kmimetype
+%patch100 -p1 -b .sip4_10
 
 
 %build
@@ -97,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.16.6-3
+- upstream patch to support newew sip
+
 * Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.16.6-2
 - rebuild (sip)