From ac8c33046b6e5baaa05f461d3d141657598d56a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 18 Oct 2014 14:44:58 +0200 Subject: [PATCH] - up to 4.11.2 --- python-PyQt4-64bit.patch | 4 +++- python-PyQt4.spec | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/python-PyQt4-64bit.patch b/python-PyQt4-64bit.patch index 8c285bd..fb76fe8 100644 --- a/python-PyQt4-64bit.patch +++ b/python-PyQt4-64bit.patch @@ -8,12 +8,14 @@ ducfg = get_config_vars() config_args = ducfg.get("CONFIG_ARGS", "") -@@ -979,16 +980,7 @@ +@@ -979,18 +980,7 @@ dynamic_pylib = "--enable-shared" in config_args if dynamic_pylib: - if glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor)): - lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"]) +- elif 'MULTIARCH' in ducfg and glob.glob('%s/lib/%s/libpython%d.%d*' % (ducfg['exec_prefix'], ducfg['MULTIARCH'], py_major, py_minor)): +- lib_dir_flag = quote('-L%s/lib/%s' % (ducfg['exec_prefix'], ducfg['MULTIARCH'])) - elif glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)): - lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"]) - else: diff --git a/python-PyQt4.spec b/python-PyQt4.spec index 8acec41..ca920ad 100644 --- a/python-PyQt4.spec +++ b/python-PyQt4.spec @@ -7,12 +7,12 @@ Summary: Python bindings for the Qt4 toolkit Summary(pl.UTF-8): Dowiązania do toolkitu Qt4 dla Pythona Name: python-%{module} -Version: 4.10.3 +Version: 4.11.2 Release: 1 License: GPL v2 or GPL v3 with FLOSS exception Group: Libraries/Python Source0: http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-%{version}.tar.gz -# Source0-md5: 8b13d2ab64e4d2fd0037b81b7e78c15c +# Source0-md5: 6bbb57f6874701adfc6909702f4a4b02 Patch0: %{name}-dbuspath.patch Patch1: %{name}-64bit.patch URL: http://www.riverbankcomputing.com/software/pyqt/ -- 2.44.0