diff --git a/.gitignore b/.gitignore index 364dc6c..377b725 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /pykde4-4.9.1.tar.xz /pykde4-4.9.2.tar.xz /pykde4-4.9.3.tar.xz +/pykde4-4.9.4.tar.xz diff --git a/0001-Fix-Python3-and-Python2-text-handling.patch b/0001-Fix-Python3-and-Python2-text-handling.patch deleted file mode 100644 index ba7662e..0000000 --- a/0001-Fix-Python3-and-Python2-text-handling.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ba44c32b266c598c764447a8411e9000e7ec7dd9 Mon Sep 17 00:00:00 2001 -From: Luca Beltrame -Date: Mon, 19 Nov 2012 19:35:30 +0100 -Subject: [PATCH] Fix Python3 and Python2 text handling. - -Somehow when refactoring the CMakeLists and fixing the duplicated -definitions, the SIP options for Python 2 and Python 3 got swapped, -causing all sorts of subtle bugs (i18n() failing on Python3, encoding -errors from QString on Python 2). This patch fixes the behavior. - -Thanks to Phil Thompson for finding out the cause. - -This fix will also be forward-ported to master. - -CCMAIL: kde-packager@kde.org ---- - CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index af7a815..56249ff 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -98,16 +98,16 @@ SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) - IF (PYTHON_3) - IF(PYQT4_VERSION STRGREATER "040904") - # Disable for newer PyQt -- SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3) -+ set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) - ELSE (PYQT4_VERSION STRGREATER "040904") -- SET(SIP_EXTRA_OPTIONS -g -x Py_v3) -+ set(SIP_EXTRA_OPTIONS -g) - ENDIF(PYQT4_VERSION STRGREATER "040904") - ELSE (PYTHON_3) - IF(PYQT4_VERSION STRGREATER "040904") - # Disable for newer PyQt -- SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) -+ set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3) - ELSE (PYQT4_VERSION STRGREATER "040904") -- SET(SIP_EXTRA_OPTIONS -g) -+ set(SIP_EXTRA_OPTIONS -g -x Py_v3) - ENDIF(PYQT4_VERSION STRGREATER "040904") - ENDIF (PYTHON_3) - --- -1.8.0 - diff --git a/pykde4.spec b/pykde4.spec index f061dbc..3497c2a 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -8,7 +8,7 @@ %endif Name: pykde4 -Version: 4.9.3 +Version: 4.9.4 Release: 2%{?dist} Summary: Python bindings for KDE4 @@ -24,8 +24,6 @@ URL: http://developer.kde.org/language-bindings/ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz ## upstream patches -# fix text handling -Patch100: 0001-Fix-Python3-and-Python2-text-handling.patch # debian patches Patch200: make_pykde4_respect_sip_flags.diff @@ -139,7 +137,6 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} %prep %setup -q -n pykde4-%{version} -%patch100 -p1 -b .text_handling %patch200 -p1 -b .respect_sip_flags %patch201 -p1 -b .kpythonpluginfactory_slots @@ -258,6 +255,12 @@ rm -rf %{buildroot} %changelog +* Wed Dec 05 2012 Rex Dieter 4.9.4-2 +- rebuild (sip) + +* Mon Dec 03 2012 Than Ngo - 4.9.4-1 +- 4.9.4 + * Wed Nov 21 2012 Rex Dieter 4.9.3-2 - upstream patch to fix text handling diff --git a/sources b/sources index a2dfb0f..ac79491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3be0ae07bd5ec03367a8da82a81b6466 pykde4-4.9.3.tar.xz +f099684d5dc39ad04d237766b166468e pykde4-4.9.4.tar.xz