rpms/PyKDE/devel PyKDE-3.16.3.patch,NONE,1.1 PyKDE.spec,1.23,1.24
Rex Dieter
rdieter at fedoraproject.org
Thu Jun 11 22:05:12 UTC 2009
- Previous message: rpms/waf/devel .cvsignore, 1.13, 1.14 import.log, 1.8, 1.9 sources, 1.13, 1.14 waf.spec, 1.16, 1.17
- Next message: rpms/abiword/devel .cvsignore, 1.24, 1.25 abiword.spec, 1.75, 1.76 sources, 1.24, 1.25 abiword-extras-2.6.4-nohash.patch, 1.1, NONE abiword-plugins-2.6.8-rindex.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/PyKDE/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12633
Modified Files:
PyKDE.spec
Added Files:
PyKDE-3.16.3.patch
Log Message:
incremental upstream patch to fix build
PyKDE-3.16.3.patch:
--- NEW FILE PyKDE-3.16.3.patch ---
diff -ruN PyKDE-3.16.2/configure.py PyKDE-3.16.3/configure.py
--- PyKDE-3.16.2/configure.py 2008-11-13 17:28:26.000000000 +0000
+++ PyKDE-3.16.3/configure.py 2009-06-10 15:38:00.000000000 +0100
@@ -54,7 +54,7 @@
kde_version_extra = None
kde_max_version = 0x030503
-sip_min_v4_version = 0x040501
+sip_min_v4_version = 0x040800
qt_min_version = 0x030200
pyqt_min_version = 0x031000
diff -ruN PyKDE-3.16.2/sip/kabc/addressbook.sip PyKDE-3.16.3/sip/kabc/addressbook.sip
--- PyKDE-3.16.2/sip/kabc/addressbook.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kabc/addressbook.sip 2009-06-10 17:47:59.000000000 +0100
@@ -208,7 +208,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KABC::Resource *)sipForceConvertTo_KABC_Resource (elem, &iserr);
+ cpp = (KABC::Resource *)sipForceConvertToType(elem, sipType_KABC_Resource, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kabc/addressee.sip PyKDE-3.16.3/sip/kabc/addressee.sip
--- PyKDE-3.16.2/sip/kabc/addressee.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kabc/addressee.sip 2009-06-10 17:48:19.000000000 +0100
@@ -356,7 +356,7 @@
QValueList<KABC::Addressee>::Iterator it;
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipBuildResult (NULL, "N", new KABC::Addressee (*it), sipClass_KABC_Addressee)) == NULL)
+ if (((inst = sipConvertFromNewType(new KABC::Addressee (*it), sipType_KABC_Addressee, NULL)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -381,7 +381,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KABC::Addressee *)sipForceConvertTo_KABC_Addressee (elem, &iserr);
+ cpp = (KABC::Addressee *)sipForceConvertToType(elem, sipType_KABC_Addressee, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
@@ -423,7 +423,7 @@
QValueList<KABC::Address>::Iterator it;
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipBuildResult (NULL, "N", new KABC::Address (*it), sipClass_KABC_Address)) == NULL)
+ if (((inst = sipConvertFromNewType(new KABC::Address (*it), sipType_KABC_Address, NULL)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -448,7 +448,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KABC::Address *)sipForceConvertTo_KABC_Address (elem, &iserr);
+ cpp = (KABC::Address *)sipForceConvertToType(elem, sipType_KABC_Address, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kabc/distributionlist.sip PyKDE-3.16.3/sip/kabc/distributionlist.sip
--- PyKDE-3.16.2/sip/kabc/distributionlist.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kabc/distributionlist.sip 2009-06-10 17:48:50.000000000 +0100
@@ -129,7 +129,7 @@
QValueList<KABC::DistributionList::Entry>::Iterator it;
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipBuildResult (NULL, "N", new KABC::DistributionList::Entry (*it), sipClass_KABC_DistributionList_Entry)) == NULL)
+ if (((inst = sipConvertFromNewType(new KABC::DistributionList::Entry (*it), sipType_KABC_DistributionList_Entry, NULL)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -154,7 +154,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KABC::DistributionList::Entry *)sipForceConvertTo_KABC_DistributionList_Entry (elem, &iserr);
+ cpp = (KABC::DistributionList::Entry *)sipForceConvertToType(elem, sipType_KABC_DistributionList_Entry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kabc/field.sip PyKDE-3.16.3/sip/kabc/field.sip
--- PyKDE-3.16.2/sip/kabc/field.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kabc/field.sip 2009-06-10 17:49:05.000000000 +0100
@@ -113,7 +113,7 @@
QValueList<KABC::Field *>::Iterator it;
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipBuildResult (NULL, "N", (KABC::Field *) (*it), sipClass_KABC_Field)) == NULL)
+ if (((inst = sipConvertFromType((KABC::Field *)(*it), sipType_KABC_Field, NULL)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -138,7 +138,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KABC::Field *)sipForceConvertTo_KABC_Field (elem, &iserr);
+ cpp = (KABC::Field *)sipForceConvertToType(elem, sipType_KABC_Field, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kabc/key.sip PyKDE-3.16.3/sip/kabc/key.sip
--- PyKDE-3.16.2/sip/kabc/key.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kabc/key.sip 2009-06-10 17:49:13.000000000 +0100
@@ -97,7 +97,7 @@
QValueList<KABC::Key>::Iterator it;
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipBuildResult (NULL, "N", new KABC::Key (*it), sipClass_KABC_Key)) == NULL)
+ if (((inst = sipConvertFromNewType(new KABC::Key(*it), sipType_KABC_Key, NULL)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -122,7 +122,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KABC::Key *)sipForceConvertTo_KABC_Key (elem, &iserr);
+ cpp = (KABC::Key *)sipForceConvertToType(elem, sipType_KABC_Key, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kabc/ldapclient.sip PyKDE-3.16.3/sip/kabc/ldapclient.sip
--- PyKDE-3.16.2/sip/kabc/ldapclient.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kabc/ldapclient.sip 2009-06-10 17:49:22.000000000 +0100
@@ -196,7 +196,7 @@
QValueList<KABC::LdapResult>::Iterator it;
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipBuildResult (NULL, "N", new KABC::LdapResult (*it), sipClass_KABC_LdapResult)) == NULL)
+ if (((inst = sipConvertFromNewType(new KABC::LdapResult(*it), sipType_KABC_LdapResult, NULL)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -221,7 +221,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KABC::LdapResult *)sipForceConvertTo_KABC_LdapResult (elem, &iserr);
+ cpp = (KABC::LdapResult *)sipForceConvertToType(elem, sipType_KABC_LdapResult, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kabc/phonenumber.sip PyKDE-3.16.3/sip/kabc/phonenumber.sip
--- PyKDE-3.16.2/sip/kabc/phonenumber.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kabc/phonenumber.sip 2009-06-10 17:49:31.000000000 +0100
@@ -144,7 +144,7 @@
QValueList<KABC::PhoneNumber>::Iterator it;
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipBuildResult (NULL, "N", new KABC::PhoneNumber (*it), sipClass_KABC_PhoneNumber)) == NULL)
+ if (((inst = sipConvertFromNewType(new KABC::PhoneNumber(*it), sipType_KABC_PhoneNumber, NULL)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -169,7 +169,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KABC::PhoneNumber *)sipForceConvertTo_KABC_PhoneNumber (elem, &iserr);
+ cpp = (KABC::PhoneNumber *)sipForceConvertToType(elem, sipType_KABC_PhoneNumber, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kdecore/bytearray.sip PyKDE-3.16.3/sip/kdecore/bytearray.sip
--- PyKDE-3.16.2/sip/kdecore/bytearray.sip 2008-11-13 17:38:05.000000000 +0000
+++ PyKDE-3.16.3/sip/kdecore/bytearray.sip 2009-06-10 22:30:28.000000000 +0100
@@ -60,56 +60,64 @@
void dcop_add (QDataStream&, SIP_PYDICT, QCString);
%MethodCode
- int iserr = 0;
- if (*a2 == "QMap<QCString,DCOPRef>")
+ const sipTypeDef *map_td = sipFindType(*a2);
+
+ if (map_td)
{
- QMap<QCString,DCOPRef> *map = (QMap<QCString,DCOPRef> *)sipForceConvertTo_QMap_0200QCString_0200DCOPRef(a1, &iserr);
+ int iserr = 0;
+ void *map_v;
+
+ map_v = sipForceConvertToType(a1, map_td, NULL,
+ SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
sipIsErr = 1;
- return 0;
}
- *a0 << *map;
- }
- else if (*a2 == "QMap<QString,DCOPRef>")
- {
- QMap<QString,DCOPRef> *map = (QMap<QString,DCOPRef> *)sipForceConvertTo_QMap_0200QString_0200DCOPRef(a1, &iserr);
+ else if (*a2 == "QMap<QCString,DCOPRef>")
[...1903 lines suppressed...]
@@ -249,12 +249,15 @@
while (PyDict_Next(sipPy, &pos, &key, &value))
{
- int iserr = 0;
+ int iserr = 0, a0_state;
- a0 = (QString *)sipForceConvertTo_QString (key, &iserr);
+ a0 = (QString *)sipForceConvertToType(key, sipType_QString, sipTransferObj, SIP_NOT_NONE, &a0_state, &iserr);
- if ((iserr) || (!PyInt_Check (value)))
+ if (iserr || !PyInt_Check(value))
{
+ if (a0)
+ sipReleaseType(a0, sipType_QString, a0_state);
+
*sipIsErr = 1;
delete qdict;
return 0;
@@ -263,6 +266,8 @@
a1 = (QWidget::FocusPolicy) PyInt_AS_LONG (value);
qdict->insert (*a0, &a1);
+
+ sipReleaseType(a0, sipType_QString, a0_state);
}
*sipCppPtr = qdict;
diff -ruN PyKDE-3.16.2/sip/kmdi/kmdimainfrm.sip PyKDE-3.16.3/sip/kmdi/kmdimainfrm.sip
--- PyKDE-3.16.2/sip/kmdi/kmdimainfrm.sip 2006-09-22 04:11:14.000000000 +0100
+++ PyKDE-3.16.3/sip/kmdi/kmdimainfrm.sip 2009-06-10 21:38:20.000000000 +0100
@@ -251,7 +251,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KDockWidget *)sipForceConvertTo_KDockWidget (elem, &iserr);
+ cpp = (KDockWidget *)sipForceConvertToType(elem, sipType_KDockWidget, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
@@ -293,7 +293,7 @@
QValueList<QRect>::Iterator it;
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipBuildResult (NULL, "N", new QRect (*it), sipClass_QRect)) == NULL)
+ if (((inst = sipConvertFromNewType(new QRect(*it), sipType_QRect, NULL)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -318,7 +318,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (QRect *)sipForceConvertTo_QRect (elem, &iserr);
+ cpp = (QRect *)sipForceConvertToType(elem, sipType_QRect, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kparts/browserextension.sip PyKDE-3.16.3/sip/kparts/browserextension.sip
--- PyKDE-3.16.2/sip/kparts/browserextension.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kparts/browserextension.sip 2009-06-10 21:42:21.000000000 +0100
@@ -393,8 +393,8 @@
QCString bcpp = it.data ();
PyObject *ainst;
PyObject *binst;
- if (((ainst = sipBuildResult (NULL, "N", new QCString (acpp), sipClass_QCString)) == NULL)
- || ((binst = sipBuildResult (NULL, "N", new QCString (bcpp), sipClass_QCString)) == NULL)
+ if (((ainst = sipConvertFromNewType(new QCString (acpp), sipType_QCString, NULL)) == NULL)
+ || ((binst = sipConvertFromNewType(new QCString (bcpp), sipType_QCString, NULL)) == NULL)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
Py_XDECREF (ainst);
@@ -414,7 +414,6 @@
if (sipIsErr == NULL)
return PyDict_Check(sipPy);
-
QMap<QCString,QCString> *cppmap = new QMap<QCString,QCString>;
PyObject *aelem, *belem;
@@ -426,8 +425,8 @@
{
int iserr = 0;
- acpp = (QCString *)sipForceConvertTo_QCString (aelem, &iserr);
- bcpp = (QCString *)sipForceConvertTo_QCString (belem, &iserr);
+ acpp = (QCString *)sipForceConvertToType(aelem, sipType_QCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+ bcpp = (QCString *)sipForceConvertToType(belem, sipType_QCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
@@ -477,7 +476,7 @@
int bcpp = it.data ();
PyObject *ainst;
PyObject *binst;
- if (((ainst = sipBuildResult (NULL, "N", new QCString (acpp), sipClass_QCString)) == NULL)
+ if (((ainst = sipConvertFromNewType(new QCString (acpp), sipType_QCString, NULL)) == NULL)
|| ((binst = PyInt_FromLong (bcpp)) < 0)
|| (PyDict_SetItem (dict, ainst, binst) < 0))
{
@@ -498,7 +497,6 @@
if (sipIsErr == NULL)
return PyDict_Check(sipPy);
-
QMap<QCString,int> *cppmap = new QMap<QCString,int>;
PyObject *aelem, *belem;
@@ -510,6 +508,8 @@
{
int iserr = 0;
+ acpp = (QCString *)sipForceConvertToType(aelem, sipType_QCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
+
if (iserr || !PyInt_Check (belem))
{
*sipIsErr = 1;
@@ -517,7 +517,6 @@
return 0;
}
- acpp = (QCString *)sipForceConvertTo_QCString (aelem, &iserr);
bcpp = PyInt_AS_LONG (belem);
cppmap->insert (*acpp, bcpp);
@@ -581,7 +580,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KParts::ReadOnlyPart *)sipForceConvertTo_KParts_ReadOnlyPart (elem, &iserr);
+ cpp = (KParts::ReadOnlyPart *)sipForceConvertToType(elem, sipType_KParts_ReadOnlyPart, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kparts/partmanager.sip PyKDE-3.16.3/sip/kparts/partmanager.sip
--- PyKDE-3.16.2/sip/kparts/partmanager.sip 2006-09-22 04:11:15.000000000 +0100
+++ PyKDE-3.16.3/sip/kparts/partmanager.sip 2009-06-10 21:43:19.000000000 +0100
@@ -160,7 +160,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KParts::Part *)sipForceConvertTo_KParts_Part (elem, &iserr);
+ cpp = (KParts::Part *)sipForceConvertToType(elem, sipType_KParts_Part, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kparts/plugin.sip PyKDE-3.16.3/sip/kparts/plugin.sip
--- PyKDE-3.16.2/sip/kparts/plugin.sip 2006-09-22 04:11:15.000000000 +0100
+++ PyKDE-3.16.3/sip/kparts/plugin.sip 2009-06-10 21:46:11.000000000 +0100
@@ -94,7 +94,7 @@
QValueList<KParts::Plugin::PluginInfo>::Iterator it;
for( it = cpplist->begin(); it != cpplist->end(); ++it )
{
- if (((inst = sipBuildResult (NULL, "N", new KParts::Plugin::PluginInfo (*it), sipClass_KParts_Plugin_PluginInfo)) == NULL)
+ if (((inst = sipConvertFromNewType(new KParts::Plugin::PluginInfo(*it), sipType_KParts_Plugin_PluginInfo, NULL)) == NULL)
|| PyList_Append (pylist, inst) < 0)
{
Py_DECREF (pylist);
@@ -119,7 +119,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KParts::Plugin::PluginInfo *)sipForceConvertTo_KParts_Plugin_PluginInfo (elem, &iserr);
+ cpp = (KParts::Plugin::PluginInfo *)sipForceConvertToType(elem, sipType_KParts_Plugin_PluginInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
@@ -189,7 +189,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KParts::Plugin *)sipForceConvertTo_KParts_Plugin (elem, &iserr);
+ cpp = (KParts::Plugin *)sipForceConvertToType(elem, sipType_KParts_Plugin, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kresources/selectdialog.sip PyKDE-3.16.3/sip/kresources/selectdialog.sip
--- PyKDE-3.16.2/sip/kresources/selectdialog.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kresources/selectdialog.sip 2009-06-10 21:47:00.000000000 +0100
@@ -110,7 +110,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KRES::Resource *)sipForceConvertTo_KRES_Resource (elem, &iserr);
+ cpp = (KRES::Resource *)sipForceConvertToType(elem, sipType_KRES_Resource, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
diff -ruN PyKDE-3.16.2/sip/kutils/kplugininfo.sip PyKDE-3.16.3/sip/kutils/kplugininfo.sip
--- PyKDE-3.16.2/sip/kutils/kplugininfo.sip 2008-03-04 20:47:14.000000000 +0000
+++ PyKDE-3.16.3/sip/kutils/kplugininfo.sip 2009-06-10 21:47:59.000000000 +0100
@@ -126,7 +126,7 @@
for (int i = 0; i < PyList_Size (sipPy); i++)
{
elem = PyList_GET_ITEM (sipPy, i);
- cpp = (KPluginInfo *)sipForceConvertTo_KPluginInfo (elem, &iserr);
+ cpp = (KPluginInfo *)sipForceConvertToType(elem, sipType_KPluginInfo, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr);
if (iserr)
{
Index: PyKDE.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyKDE/devel/PyKDE.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- PyKDE.spec 6 Jun 2009 00:18:54 -0000 1.23
+++ PyKDE.spec 11 Jun 2009 22:04:41 -0000 1.24
@@ -14,7 +14,7 @@ BuildRequires: libutempter-devel
Summary: Python bindings for KDE3
Name: PyKDE
Version: 3.16.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
URL: http://www.riverbankcomputing.com/software/pykde/intro
@@ -25,12 +25,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version
# http://mats.imk.fraunhofer.de/pipermail/pykde/2006-November/014627.html
Patch2: PyKDE-3.16.0-kmimetype.patch
+## upstream patches
+Patch100: PyKDE-3.16.3.patch
+
BuildRequires: python-devel >= 2.3
%global python_ver %(%{__python} -c "import sys ; print sys.version[:3]")
%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
-BuildRequires: sip-devel >= 4.7.9
-BuildRequires: %{PyQt3}-devel >= 3.17.6
+BuildRequires: sip-devel >= 4.8
+BuildRequires: %{PyQt3}-devel >= 3.18
Provides: PyKDE3 = %{version}-%{release}
@@ -65,6 +68,8 @@ Sip files and documentation needed for d
%patch2 -p1 -b .kmimetype
+%patch100 -p1 -b .PyKDE-3.16.3
+
%build
unset QTDIR || : ; source /etc/profile.d/qt.sh
- Previous message: rpms/waf/devel .cvsignore, 1.13, 1.14 import.log, 1.8, 1.9 sources, 1.13, 1.14 waf.spec, 1.16, 1.17
- Next message: rpms/abiword/devel .cvsignore, 1.24, 1.25 abiword.spec, 1.75, 1.76 sources, 1.24, 1.25 abiword-extras-2.6.4-nohash.patch, 1.1, NONE abiword-plugins-2.6.8-rindex.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list