]> git.ipfire.org Git - people/pmueller/ipfire-3.x.git/commitdiff
pyQt: Update to 4.9.1.
authorStefan Schantl <stefan.schantl@ipfire.org>
Wed, 23 May 2012 19:58:25 +0000 (21:58 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Wed, 23 May 2012 19:58:25 +0000 (21:58 +0200)
Update to latest stable version.

pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch [deleted file]
pyQt/patches/PyQt-x11-gpl-4.8.3-pyuic_shbang.patch [deleted file]
pyQt/pyQt.nm

diff --git a/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch b/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
deleted file mode 100644 (file)
index 91ddb7f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp.orig PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp
---- PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp.orig      2010-02-23 12:33:44.000000000 +0100
-+++ PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp   2010-02-23 12:45:03.000000000 +0100
-@@ -399,8 +399,7 @@ RCCResourceLibrary::writeHeader(FILE *ou
-     fprintf(out, "# -*- coding: utf-8 -*-\n\n");
-     fprintf(out, "# Resource object code\n");
-     fprintf(out, "#\n");
--    fprintf(out, "# Created: %s\n", QDateTime::currentDateTime().toString().toLatin1().constData());
--    fprintf(out, "#      by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR);
-+    fprintf(out, "# Created by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR);
-     fprintf(out, "#\n");
-     fprintf(out, "# WARNING! All changes made in this file will be lost!\n");
-     fprintf(out, "\n");
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
deleted file mode 100644 (file)
index 58a64f6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-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>
index 5171e48559ea9e714989ecaffef36e257a21421a..884c6f51bbe94dd7adf4f16bcbb5ab31b8ac843c 100644 (file)
@@ -4,9 +4,8 @@
 ###############################################################################
 
 name       = pyQt
-version    = 4.8.6
-release    = 2
-epoch      = 0
+version    = 4.9.1
+release    = 1
 
 groups     = Development/Languages
 url        = http://www.riverbankcomputing.com/software/pyqt/
@@ -26,8 +25,8 @@ build
                libX11-devel
                libXext-devel
                python-devel
-               qt-devel
-               sip-devel>=4.13
+               qt-devel>=4.8.1
+               sip-devel>=4.13.1
        end
 
        DIR_APP = %{DIR_SRC}/PyQt-x11-gpl-%{version}
@@ -61,10 +60,10 @@ packages
                template DEVEL
 
                files
-                       /usr/bin
-                       /usr/lib/python*/site-packages/PyQt4/pyqtconfig*
-                       /usr/lib/python*/site-packages/PyQt4/uic/pyuic.py*
-                       /usr/share/sip
+                       %{bindir}
+                       %{libdir}/python*/site-packages/PyQt4/pyqtconfig*
+                       %{libdir}/python*/site-packages/PyQt4/uic/pyuic.py*
+                       %{datadir}/sip
                end
        end