Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2013-03-24 21:56:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2013-03-14 11:23:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2013-03-24 21:58:59.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 21 08:27:22 UTC 2013 - [email protected] + +- Added fix-braindead-logic-in-PyQt-version-detection.diff, fixes + build with PyQT >= 4.10 +- Add provides/obsoletes for go-kate in libktexteditor, both packages + ship the same syntax file + +------------------------------------------------------------------- New: ---- fix-braindead-logic-in-PyQt-version-detection.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.Ols52P/_old 2013-03-24 21:59:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Ols52P/_new 2013-03-24 21:59:01.000000000 +0100 @@ -26,6 +26,8 @@ Source0: %{name}-%{version}.tar.xz #PATCH-FIX-UPSTREAM use-a-numeric-comparision.patch -- Fixes build with python-qt 4.10 Patch0: use-a-numeric-comparision.patch +#PATCH-FIX-UPSTREAM Fix-braindead-logic-in-PyQt-version-detection.diff -- Also fixes build with python-qt 4.10 +Patch1: fix-braindead-logic-in-PyQt-version-detection.diff BuildRequires: fdupes BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %version @@ -47,6 +49,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %ifarch ppc64 @@ -92,6 +95,10 @@ %package -n libktexteditor Summary: Advanced Text Editor library Group: Productivity/Editors/Other +# With the sr#160617, go-kate package is no longer shipped, +# so adding specific version, if the package will return +Provides: go-kate = 1.0.3 +Obsoletes: go-kate <= 1.0.3 %description -n libktexteditor The libraries shared by kwrite and kate editors. ++++++ fix-braindead-logic-in-PyQt-version-detection.diff ++++++ >From efea0f878622bec033943e50355015a18b7dcfec Mon Sep 17 00:00:00 2001 From: Luca Beltrame <[email protected]> Date: Fri, 15 Mar 2013 00:23:34 +0100 Subject: [PATCH] Fix braindead logic in PyQt version detection. Fixes build for PyQt >= 4.10. CCMAIL: [email protected] --- kate/plugins/pate/sip/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kate/plugins/pate/sip/CMakeLists.txt b/kate/plugins/pate/sip/CMakeLists.txt index d32266f..58b86e1 100644 --- a/kate/plugins/pate/sip/CMakeLists.txt +++ b/kate/plugins/pate/sip/CMakeLists.txt @@ -23,12 +23,12 @@ set(SIP_INCLUDES ${PYQT4_SIP_DIR} ${PYKDE4_SIP_DIR} ./kate) set(SIP_CONCAT_PARTS 1) set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG}) -if(PYQT4_VERSION LESS "040905") +if(PYQT4_VERSION STRLESS "040905") set(SIP_EXTRA_OPTIONS -g) -else (PYQT4_VERSION LESS "040905") +else (PYQT4_VERSION STRLESS "040905") # Disable QVector<int> for newer PyQt set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) -endif(PYQT4_VERSION LESS "040905") +endif(PYQT4_VERSION STRLESS "040905") add_sip_python_module(PyKate4.kate ./kate/katemod.sip ${KDE4_KTEXTEDITOR_LIBS} kateinterfaces) -- 1.8.2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
