diff --git a/.cvsignore b/.cvsignore index 282cd36..b9a9301 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -PyKDE-3.16.1.tar.bz2 +PyKDE-3.16.2.tar.bz2 diff --git a/PyKDE.spec b/PyKDE.spec index a336336..654b8b8 100644 --- a/PyKDE.spec +++ b/PyKDE.spec @@ -2,14 +2,23 @@ # Fedora review: # http://bugzilla.redhat.com/190367 +%if 0%{?fedora} > 6 +%define kdelibs3 kdelibs3 +%define PyQt3 PyQt3 +%else +%define kdelibs3 kdelibs +%define PyQt3 PyQt +BuildRequires: libutempter-devel +%endif + Summary: Python bindings for KDE3 Name: PyKDE -Version: 3.16.1 +Version: 3.16.2 Release: 1%{?dist} License: GPLv2 -URL: http://www.riverbankcomputing.co.uk/pykde/ -Source0: http://www.riverbankcomputing.com/Downloads/PyKDE3/PyKDE-%{version}.tar.bz2 +URL: http://www.riverbankcomputing.com/software/pykde/intro +Source0: http://www.riverbankcomputing.com/static/Downloads/PyKDE3/PyKDE-%{version}.tar.bz2 Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -20,18 +29,21 @@ 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 -BuildRequires: PyQt-devel +BuildRequires: sip-devel >= 4.7.9 +BuildRequires: %{PyQt3}-devel >= 3.17.6 + +Provides: PyKDE3 = %{version}-%{release} + ## try to leave this unversioned, for now -- Rex -Requires: PyQt +Requires: %{PyQt3} #global pyqt_ver %(pyuic -version 2>&1 | cut -d' ' -f5) #if 0%{?pyqt_ver} > 2 -#Requires: PyQt = %{pyqt_ver} +#Requires: PyQt3 = %{pyqt_ver} #endif -BuildRequires: kdelibs3-devel +BuildRequires: %{kdelibs3}-devel %global kdelibs3_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.8) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1) -Requires: kdelibs3 >= %{kdelibs3_ver} +Requires: %{kdelibs3} >= %{kdelibs3_ver} %description These are the Python bindings for KDE3. @@ -39,8 +51,9 @@ These are the Python bindings for KDE3. %package devel Summary: %{name} SIP files Group: Development/Languages +Provides: PyKDE3-devel = %{version}-%{release} Requires: %{name} = %{version}-%{release} -Requires: sip-devel +Requires: %{PyQt3}-devel #Obsoletes: %{name}-docs < %{version}-%{release} Provides: %{name}-docs = %{version}-%{release} %description devel @@ -56,10 +69,12 @@ Sip files and documentation needed for developing with %{name} %build unset QTDIR || : ; source /etc/profile.d/qt.sh -%{__python} configure.py -L %{_lib} -d %{python_sitearch} +%{__python} configure.py \ + -L %{_lib} \ + -d %{python_sitearch} \ + -i -# smp broken, do the best we can -make -k %{?_smp_mflags} || make +make %{?_smp_mflags} %install @@ -86,6 +101,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Nov 17 2008 Rex Dieter 3.16.2-1 +- PyKDE-3.16.2 + +* Wed Jun 10 2008 Rex Dieter 3.16.1-2 +- Provides: PyKDE3(-devel) +- Requires: PyQt3(-devel) + * Fri Mar 07 2008 Rex Dieter 3.16.1-1 - PyKDE-3.16.1 diff --git a/sources b/sources index 04c9651..d39db86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -986e67ced4753cac5a4b7be8031ad64e PyKDE-3.16.1.tar.bz2 +5f5e13ce3c9ca78f7c214b5399e7b81d PyKDE-3.16.2.tar.bz2