rpms/PyKDE/F-12 PyKDE-3.16.7.patch,NONE,1.1 PyKDE.spec,1.29,1.30

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/PyKDE/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31409/F-12

Modified Files:
	PyKDE.spec 
Added Files:
	PyKDE-3.16.7.patch 
Log Message:
Sync from devel:

* Mon Jan 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.16.6-3
- upstream patch to support newer sip

* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.16.6-2
- rebuild (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/F-12/PyKDE.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- PyKDE.spec	20 Nov 2009 15:25:13 -0000	1.29
+++ PyKDE.spec	10 Feb 2010 02:11:30 -0000	1.30
@@ -13,7 +13,7 @@ BuildRequires: libutempter-devel
 Summary: Python bindings for KDE3
 Name: 	 PyKDE
 Version: 3.16.6
-Release: 1%{?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,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 25 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.16.6-3
+- upstream patch to support newer sip
+
+* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 3.16.6-2
+- rebuild (sip)
+
 * Fri Nov 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 3.16.6-1
 - PyKDE-3.16.6
 - Requires: sip-api(%%_sip_api_major) >= %%_sip_api