[PyQt4] 4.9.2
Rex Dieter
rdieter at fedoraproject.org
Fri Jun 22 12:37:42 UTC 2012
commit d28beaac208502ace02c89bbd7fbaae6a1b24b7a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Jun 22 07:40:50 2012 -0500
4.9.2
.gitignore | 1 +
PyQt-x11-gpl-4.8.3-pyuic_shbang.patch | 8 --------
PyQt-x11-gpl-4.9.2-pyuic_shbang.patch | 8 ++++++++
PyQt4.spec | 11 +++++++----
sources | 2 +-
5 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2f6d987..e0c7852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/PyQt-x11-gpl-4.8.6.tar.gz
/PyQt-x11-gpl-4.9.1.tar.gz
+/PyQt-x11-gpl-4.9.2.tar.gz
diff --git a/PyQt-x11-gpl-4.9.2-pyuic_shbang.patch b/PyQt-x11-gpl-4.9.2-pyuic_shbang.patch
new file mode 100644
index 0000000..bece5ae
--- /dev/null
+++ b/PyQt-x11-gpl-4.9.2-pyuic_shbang.patch
@@ -0,0 +1,8 @@
+diff -up PyQt-x11-gpl-4.9.2/pyuic/uic/pyuic.py.orig PyQt-x11-gpl-4.9.2/pyuic/uic/pyuic.py
+--- PyQt-x11-gpl-4.9.2/pyuic/uic/pyuic.py.orig 2012-06-20 13:18:31.000000000 -0500
++++ PyQt-x11-gpl-4.9.2/pyuic/uic/pyuic.py 2012-06-22 07:05:43.719189884 -0500
+@@ -1,3 +1,4 @@
++#!/usr/bin/python -tt
+ #############################################################################
+ ##
+ ## Copyright (c) 2012 Riverbank Computing Limited <info at riverbankcomputing.com>
diff --git a/PyQt4.spec b/PyQt4.spec
index cacc721..deccf99 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -3,8 +3,8 @@
Summary: Python bindings for Qt4
Name: PyQt4
-Version: 4.9.1
-Release: 4%{?dist}
+Version: 4.9.2
+Release: 1%{?dist}
# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
License: GPLv3 or GPLv2 with exceptions
@@ -13,7 +13,6 @@ Url: http://www.riverbankcomputing.com/software/pyqt/
Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl%{?snap:-snapshot}-%{version}%{?snap:-%{snap}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch4: PyQt-x11-gpl-4.8.3-pyuic_shbang.patch
## upstreamable patches
# fix multilib conflict because of timestamp
@@ -22,6 +21,7 @@ Patch50: PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
# simpler approach may be to not try to change these at buildime (only verify),
# if /usr/include/GL/gl.h ever changes these types, we have bigger problems
Patch51: PyQt-x11-gpl-4.9.1-opengl_types.patch
+Patch52: PyQt-x11-gpl-4.9.2-pyuic_shbang.patch
## upstream patches
# fix FTBFS on ARM
@@ -115,9 +115,9 @@ from any of the Qt4 classes (e.g. KDE or your own).
%prep
%setup -q -n PyQt-x11-gpl%{?snap:-snapshot}-%{version}%{?snap:-%{snap}}
-%patch4 -p1
%patch50 -p1 -b .timestamp
%patch51 -p1 -b .opengl_types
+%patch52 -p1 -b .pyuic_shbang
# save orig for comparison later
cp -a ./sip/QtOpenGL/opengl_types.sip ./sip/QtOpenGL/opengl_types.sip.orig
%patch60 -p1 -b .arm
@@ -285,6 +285,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Jun 22 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.2-1
+- 4.9.2
+
* Thu Jun 21 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.1-4
- PyQt4 opengl-types.sip multilib conflict (#509415)
diff --git a/sources b/sources
index 4f83762..e90c432 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f495dc49f71e3bfb64bf942e0d8bb3c PyQt-x11-gpl-4.9.1.tar.gz
+df3f588118697d6d16f7ffddb141d0d2 PyQt-x11-gpl-4.9.2.tar.gz
More information about the scm-commits
mailing list