[PyQt4] - PyQt-x11-gpl-4.8

[Rex Dieter]

commit e5c56d77a1c5b2bbdc419b5a7477a85388499e20
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 23 11:41:40 2010 -0500

    - PyQt-x11-gpl-4.8

 .gitignore                             |    4 +--
 PyQt-x11-gpl-4.5.1-pyuic_shebang.patch |    9 -------
 PyQt-x11-gpl-4.5.2-QT_SHARED.patch     |   19 ---------------
 PyQt-x11-gpl-4.8-pyuic_shbang.patch    |    9 +++++++
 PyQt4-4.7.7-fix-scpk-and-flags.patch   |   40 --------------------------------
 PyQt4.spec                             |   20 ++++++++--------
 sources                                |    2 +-
 7 files changed, 21 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 675e4da..cc1a630 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-PyQt-x11-gpl-4.7.4.tar.gz
-/PyQt-x11-gpl-4.7.6.tar.gz
-/PyQt-x11-gpl-4.7.7.tar.gz
+/PyQt-x11-gpl-4.8.tar.gz
diff --git a/PyQt-x11-gpl-4.8-pyuic_shbang.patch b/PyQt-x11-gpl-4.8-pyuic_shbang.patch
new file mode 100644
index 0000000..281b332
--- /dev/null
+++ b/PyQt-x11-gpl-4.8-pyuic_shbang.patch
@@ -0,0 +1,9 @@
+diff -up PyQt-x11-gpl-4.8/pyuic/uic/pyuic.py.shbang PyQt-x11-gpl-4.8/pyuic/uic/pyuic.py
+--- PyQt-x11-gpl-4.8/pyuic/uic/pyuic.py.shbang	2010-10-22 07:36:23.000000000 -0500
++++ PyQt-x11-gpl-4.8/pyuic/uic/pyuic.py	2010-10-23 11:38:47.936657568 -0500
+@@ -1,4 +1,5 @@
+ # Copyright (c) 2010 Riverbank Computing Limited.
++#!/usr/bin/python -tt
+ 
+ 
+ import sys
diff --git a/PyQt4.spec b/PyQt4.spec
index 43021db..3955aa8 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -7,8 +7,8 @@
 
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.7.7
-Release: 3%{?dist}
+Version: 4.8
+Release: 1%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -18,16 +18,13 @@ Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:  PyQt-x11-gpl-4.4.4-64bit.patch
-# HACK! FIXME: ping upstream why this isn't working right. -- Rex
-Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
-Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
+Patch4:  PyQt-x11-gpl-4.8-pyuic_shbang.patch
 # fix multilib conflict because of timestamp
 Patch5:  PyQt-x11-gpl-4.6.2-timestamp-multilib.patch
 # fix implicit linking when checking for QtAssistant, QtHelp
 Patch6:  PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch
 
 ## upstream patches
-Patch100: PyQt4-4.7.7-fix-scpk-and-flags.patch
 
 BuildRequires: chrpath
 BuildRequires: dbus-devel dbus-python-devel
@@ -45,11 +42,11 @@ BuildRequires: python-devel
 %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
-BuildRequires: sip-devel >= 4.10.3
+BuildRequires: sip-devel >= 4.11.2
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel
-BuildRequires: python3-sip-devel >= 4.10.3
+BuildRequires: python3-sip-devel >= 4.11.2
 %endif # with_python3
 
 Requires: dbus-python
@@ -95,11 +92,9 @@ from any of the Qt4 classes (e.g. KDE or your own).
 %setup -q -n PyQt-x11-gpl-%{version}%{?snap:-snapshot-%{snap}}
 
 %patch1 -p1 -b .64bit
-%patch2 -p1 -b .QT_SHARED
 %patch4 -p1 
 %patch5 -p1 -b .timestamp
 %patch6 -p1 -b .fix-implicit-linking
-%patch100 -p1 -b .fix-scpk-and-flags
 
 ## permissions
 # mark examples non-executable
@@ -118,6 +113,7 @@ PATH=%{_qt4_bindir}:$PATH ; export PATH
 
 # Python 2 build:
 %{__python} configure.py \
+  --assume-shared \
   --confirm-license \
   --qmake=%{_qt4_qmake} \
   --verbose 
@@ -128,6 +124,7 @@ make %{?_smp_mflags}
 %if 0%{?with_python3}
 pushd %{py3dir}
 %{__python3} configure.py \
+  --assume-shared
   --confirm-license \
   --qmake=%{_qt4_qmake} \
   --verbose 
@@ -247,6 +244,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 23 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.8-1
+- PyQt-x11-gpl-4.8
+
 * Sat Oct 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.7-3
 - backport patch to fix kdebindings/pykde ftbfs
 - drop sip-devel min version a bit to match reality
diff --git a/sources b/sources
index 8040114..257a894 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7b30ab25ee976407b37052f2f724bce  PyQt-x11-gpl-4.7.7.tar.gz
+003d195498eb42ca2daf7615fa01488d  PyQt-x11-gpl-4.8.tar.gz