- rel 2; 64bit patch fixed

Changed files:
    python-PyQt4-64bit.patch -> 1.4
    python-PyQt4.spec -> 1.68

diff --git a/python-PyQt4-64bit.patch b/python-PyQt4-64bit.patch
index 2b0830e29ea372544f3fc6c8ce6352907e6ba99b..cecef4c707d6ed54f950390a7a0521fe6c847cd1 100644 (file)
--- a/python-PyQt4-64bit.patch
+++ b/python-PyQt4-64bit.patch
@@ -1,6 +1,6 @@
---- PyQt-x11-gpl-4.4.4/configure.py.orig       2008-11-18 03:44:10.692417175 +0100
-+++ PyQt-x11-gpl-4.4.4/configure.py    2008-11-18 03:47:26.735730174 +0100
-@@ -758,16 +758,15 @@
+--- PyQt-x11-gpl-4.8.4/configure.py~   2011-07-01 15:32:10.000000000 +0200
++++ PyQt-x11-gpl-4.8.4/configure.py    2011-07-01 15:33:57.466398732 +0200
+@@ -946,22 +946,15 @@
              else:
                  # Use distutils to get the additional configuration.
                  from distutils.sysconfig import get_config_vars
@@ -11,11 +11,17 @@
                      # We need to work out how to specify the right framework
                      # version.
                      link = "-framework Python"
--                elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and
--                      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 "--enable-shared" in ducfg.get("CONFIG_ARGS", ""):
+-                    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 glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor)):
+-                        lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"])
+-                    else:
+-                        sipconfig.inform("Qt Designer plugin disabled because Python library couldn't be found")
+-                        opts.designer_plugin = False
+-
 -                    link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi)
-+                elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") ): 
++                elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") ):
 +                    link = "-L%s -lpython%d.%d" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor)
                  else:
                      sipconfig.inform("Qt Designer plugin disabled because Python library is static")

diff --git a/python-PyQt4.spec b/python-PyQt4.spec
index f5c161d110572b640c7ee9b1f833ead8673eba16..09bdb621cf73f6677172046cb5ad50718c1372d3 100644 (file)
--- a/python-PyQt4.spec
+++ b/python-PyQt4.spec
@@ -8,7 +8,7 @@ Summary:        Python bindings for the Qt4 toolkit
 Summary(pl.UTF-8):     Dowiązania do toolkitu Qt4 dla Pythona
 Name:          python-%{module}
 Version:       4.8.4
-Release:       1
+Release:       2
 License:       GPL v2 or GPL v3 with FLOSS exception
 Group:         Libraries/Python
 Source0:       http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz