diff --git a/PyKDE-3.16.0-kmimetype.patch b/PyKDE-3.16.0-kmimetype.patch new file mode 100644 index 0000000..8fdc074 --- /dev/null +++ b/PyKDE-3.16.0-kmimetype.patch @@ -0,0 +1,11 @@ +--- PyKDE-3.16.0/sip/kio/kmimetype.sip 2006-09-22 18:41:53.000000000 +0530 ++++ PyKDE-3.16.0/sip/kio/kmimetype.sip 2006-11-06 05:27:39.000000000 +0530 +@@ -101,7 +101,7 @@ + %If ( KDE_3_2_0 - ) + static KMimeType::Ptr defaultMimeTypePtr (); + QString parentMimeType () const; +- bool is (const QString&) const; ++ bool is (const QString&) const /PyName=is_/; //'is' is a reserved keyword in python + static KMimeType::Ptr diagnoseFileName (const QString&, QString&); + %End + diff --git a/PyKDE.spec b/PyKDE.spec index 18a2d6c..d311f6e 100644 --- a/PyKDE.spec +++ b/PyKDE.spec @@ -2,7 +2,7 @@ Summary: Python bindings for KDE Name: PyKDE Version: 3.16.0 -Release: 2%{?dist} +Release: 5%{?dist} License: GPL URL: http://www.riverbankcomputing.co.uk/pykde/ @@ -11,6 +11,8 @@ Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: PyKDE-3.16.0-konsolepart.patch +# http://mats.imk.fraunhofer.de/pipermail/pykde/2006-November/014627.html +Patch2: PyKDE-3.16.0-kmimetype.patch BuildRequires: python-devel >= 2.3 %global python_ver %(%{__python} -c "import sys ; print sys.version[:3]") @@ -21,11 +23,12 @@ Requires: python-abi = %{python_ver} BuildRequires: sip-devel >= 4.4.3 BuildRequires: PyQt-devel >= 3.16 -%global pyqt_ver %(pyuic -version 2>&1 | cut -d' ' -f5) -%if "%{?pyqt_ver}" > "2" -Requires: PyQt = %{pyqt_ver} -%endif - +## try to leave this unversioned, for now -- Rex +Requires: PyQt +#global pyqt_ver %(pyuic -version 2>&1 | cut -d' ' -f5) +#if "%{?pyqt_ver}" > "2" +#Requires: PyQt = %{pyqt_ver} +#endif BuildRequires: kdelibs-devel kdebase %global kdelibs_ver %(kde-config --version 2>/dev/null | grep KDE | cut -d' ' -f2 | cut -d- -f1) @@ -42,6 +45,7 @@ These are the Python bindings for KDE. Summary: %{name} SIP files Group: Development/Languages Requires: %{name} = %{version}-%{release} +Requires: sip-devel #Obsoletes: %{name}-docs < %{version}-%{release} Provides: %{name}-docs = %{version}-%{release} %description devel @@ -52,6 +56,7 @@ Sip files and documentation needed for developing with %{name} %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}} %patch1 -p1 -b .konsolepart +%patch2 -p1 -b .kmimetype %build @@ -59,7 +64,7 @@ unset QTDIR || : ; source /etc/profile.d/qt.sh %{__python} configure.py -L %{_lib} -d %{python_sitedir} -# smp broken +# smp broken, do the best we can make -k %{?_smp_mflags} || make @@ -84,12 +89,18 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %doc doc/* examples -# %_datadir/sip should be owned by sip-devel (#206633) -#dir %{_datadir}/sip %{_datadir}/sip/* %changelog +* Thu Nov 09 2006 Rex Dieter 3.16.0-5 +- kmimetype patch +- devel: Requires: sip-devel + +* Wed Nov 08 2006 Rex Dieter 3.16.0-3 +- (unversioned) Requires: PyQt +- rebuild for PyQt-3.17 (fc7+) + * Wed Oct 04 2006 Rex Dieter 3.16.0-2 - respin