[PyQt4] PyQt-4.9.5

Rex Dieter rdieter at fedoraproject.org
Mon Oct 1 13:26:07 UTC 2012


commit 91b7e91cf0127da12df161846b42fb4989b0ca0b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 1 08:26:06 2012 -0500

    PyQt-4.9.5

 .gitignore                                         |    1 +
 ... => PyQt-x11-gpl-4.9.5-timestamp_multilib.patch |   10 +++++-----
 PyQt4.spec                                         |   17 ++++++++++-------
 sources                                            |    2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f1c801..3649528 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /PyQt-x11-gpl-4.8.6.tar.gz
 /PyQt-x11-gpl-4.9.1.tar.gz
 /PyQt-x11-gpl-4.9.4.tar.gz
+/PyQt-x11-gpl-4.9.5.tar.gz
diff --git a/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch b/PyQt-x11-gpl-4.9.5-timestamp_multilib.patch
similarity index 59%
rename from PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
rename to PyQt-x11-gpl-4.9.5-timestamp_multilib.patch
index 91ddb7f..4399c9b 100644
--- a/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
+++ b/PyQt-x11-gpl-4.9.5-timestamp_multilib.patch
@@ -1,11 +1,11 @@
-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
+diff -up PyQt-x11-gpl-4.9.5/pyrcc/rcc.cpp.timestamp PyQt-x11-gpl-4.9.5/pyrcc/rcc.cpp
+--- PyQt-x11-gpl-4.9.5/pyrcc/rcc.cpp.timestamp	2012-09-29 06:35:02.000000000 -0500
++++ PyQt-x11-gpl-4.9.5/pyrcc/rcc.cpp	2012-10-01 08:22:03.197843077 -0500
+@@ -407,8 +407,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, "# Created: %s\n", QDateTime::currentDateTime().toString().toUtf8().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");
diff --git a/PyQt4.spec b/PyQt4.spec
index b6b6ca6..672927d 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -1,24 +1,24 @@
 
-%if 0%{?fedora} > 12
+%if 0%{?fedora}
 %global with_python3 1
 %endif
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.9.4
-Release: 5%{?dist}
+Version: 4.9.5
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
 Group: 	 Development/Languages
 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
+Source0:  http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl%{?snap:-snapshot}-%{version}%{?snap:-%{snap}}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 ## upstreamable patches
 # fix multilib conflict because of timestamp
-Patch50:  PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
+Patch50:  PyQt-x11-gpl-4.9.5-timestamp_multilib.patch 
 # multilib-safe(r)  opengl_types.sip (hopefully)
 # 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
@@ -42,11 +42,11 @@ BuildRequires: pkgconfig(QtGui) pkgconfig(QtNetwork)
 BuildRequires: qscintilla
 BuildRequires: pkgconfig(QtWebKit)
 %endif
-BuildRequires: sip-devel >= 4.13.3
+BuildRequires: sip-devel >= 4.14
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel 
-BuildRequires: python3-sip-devel >= 4.13.3
+BuildRequires: python3-sip-devel >= 4.14
 %endif # with_python3
 
 Requires: dbus-python
@@ -287,6 +287,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 01 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.5-1
+- PyQt-4.9.5
+
 * Sat Aug 04 2012 David Malcolm <dmalcolm at redhat.com> - 4.9.4-5
 - rebuild for https://fedoraproject.org/wiki/Features/Python_3.3
 
diff --git a/sources b/sources
index 7e4f4a5..09d3dda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a0b6a820633366365af5124ddbd059c7  PyQt-x11-gpl-4.9.4.tar.gz
+e4cdd6619c63655f7510efb4df8462fb  PyQt-x11-gpl-4.9.5.tar.gz


More information about the scm-commits mailing list