pyQt: Update to 4.8.6.

diff --git a/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch b/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch
deleted file mode 100644 (file)
index 0e52885..0000000
--- a/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up PyQt-x11-gpl-4.4.4/configure.py.64bit PyQt-x11-gpl-4.4.4/configure.py
---- PyQt-x11-gpl-4.4.4/configure.py.64bit      2008-11-08 05:55:49.000000000 -0600
-+++ PyQt-x11-gpl-4.4.4/configure.py    2008-11-10 14:01:14.000000000 -0600
-@@ -756,16 +756,15 @@ include(%s)
-             else:
-                 # Use distutils to get the additional configuration.
-                 from distutils.sysconfig import get_config_vars
-+                from distutils.sysconfig import get_python_lib
-                 ducfg = get_config_vars()
- 
-                 if sys.platform == "darwin":
-                     # 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"])
--                    link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor)
-+                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")
-                     opts.designer_plugin = False

diff --git a/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch b/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch
deleted file mode 100644 (file)
index cfd86d6..0000000
--- a/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED PyQt-x11-gpl-4.5.2/configure.py
---- PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED  2009-07-16 08:34:48.419358104 -0500
-+++ PyQt-x11-gpl-4.5.2/configure.py    2009-07-16 08:34:54.260358064 -0500
-@@ -1679,11 +1679,11 @@ int main(int, char **)
- 
-     out << QLibraryInfo::licensee() << '\\n';
- 
--#if defined(QT_SHARED) || defined(QT_DLL)
-+//#if defined(QT_SHARED) || defined(QT_DLL)
-     out << "shared\\n";
--#else
--    out << "\\n";
--#endif
-+//#else
-+//    out << "\\n";
-+//#endif
- 
-     // Determine which features should be disabled.
- 

diff --git a/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch b/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch
deleted file mode 100644 (file)
index 2d73acd..0000000
--- a/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up PyQt-x11-gpl-4.7.2/configure.py.fix-implicit-linking PyQt-x11-gpl-4.7.2/configure.py
---- PyQt-x11-gpl-4.7.2/configure.py.fix-implicit-linking       2010-03-18 07:08:13.000000000 -0500
-+++ PyQt-x11-gpl-4.7.2/configure.py    2010-03-18 07:09:46.157734414 -0500
-@@ -1173,7 +1173,7 @@ def compile_qt_program(name, mname, extr
-     opengl = (mname == "QtOpenGL")
- 
-     qt = [mname]
--    if mname in ("QtOpenGL", "QtWebKit"):
-+    if mname in ("QtOpenGL", "QtWebKit", "QtAssistant", "QtHelp"):
-         qt.append("QtCore")
- 
-     makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,

diff --git a/pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch b/pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch
new file mode 100644 (file)
index 0000000..58a64f6
--- /dev/null
+++ b/pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch
@@ -0,0 +1,8 @@
+diff -up PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py.pyuic_shbang PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py
+--- PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py.pyuic_shbang   2011-01-14 21:44:29.000000000 -0600
++++ PyQt-x11-gpl-snapshot-4.8.3-454d07a16153/pyuic/uic/pyuic.py        2011-01-15 08:56:58.371972273 -0600
+@@ -1,3 +1,4 @@
++#!/usr/bin/python -tt
+ #############################################################################
+ ##
+ ## Copyright (c) 2011 Riverbank Computing Limited <info@riverbankcomputing.com>

diff --git a/pyQt/pyQt.nm b/pyQt/pyQt.nm
index 0cf784487c842fd94c7d3fb143cff91690c9546f..2181eb43d77807d4c243088d3b99a7cc813eeb5a 100644 (file)
--- a/pyQt/pyQt.nm
+++ b/pyQt/pyQt.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = pyQt
-version    = 4.8.1
-release    = 2
+version    = 4.8.6
+release    = 1
 epoch      = 0
 
 groups     = Development/Languages
@@ -17,7 +17,7 @@ description
         Python bindings for Qt4
 end
 
-source_dl  =
+source_dl  = http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/
 sources    = PyQt-x11-gpl-%{version}.tar.gz
 
 build
@@ -27,7 +27,7 @@ build
                libXext-devel
                python-devel
                qt-devel
-               sip-devel
+               sip-devel>=4.13
        end
 
        DIR_APP = %{DIR_SRC}/PyQt-x11-gpl-%{version}