[PyQt4] - fix pyuic_shbang.patch - drop implicit-linking patch (no longer needed)

[Rex Dieter]

commit ade7b8d26717512e463c7e54d651be4a896bde74
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Oct 27 09:19:38 2010 -0500

    - fix pyuic_shbang.patch
    - drop implicit-linking patch (no longer needed)

 PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch |   12 ------------
 PyQt-x11-gpl-4.8-pyuic_shbang.patch           |   11 +++++------
 PyQt4.spec                                    |    9 +++++----
 3 files changed, 10 insertions(+), 22 deletions(-)
---
diff --git a/PyQt-x11-gpl-4.8-pyuic_shbang.patch b/PyQt-x11-gpl-4.8-pyuic_shbang.patch
index 281b332..93d572b 100644
--- a/PyQt-x11-gpl-4.8-pyuic_shbang.patch
+++ b/PyQt-x11-gpl-4.8-pyuic_shbang.patch
@@ -1,9 +1,8 @@
-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.
+diff -up PyQt-x11-gpl-4.8/pyuic/uic/pyuic.py.pyuic_shbang PyQt-x11-gpl-4.8/pyuic/uic/pyuic.py
+--- PyQt-x11-gpl-4.8/pyuic/uic/pyuic.py.pyuic_shbang	2010-10-22 07:36:23.000000000 -0500
++++ PyQt-x11-gpl-4.8/pyuic/uic/pyuic.py	2010-10-27 08:46:57.034126404 -0500
+@@ -1,3 +1,4 @@
 +#!/usr/bin/python -tt
+ # Copyright (c) 2010 Riverbank Computing Limited.
  
  
- import sys
diff --git a/PyQt4.spec b/PyQt4.spec
index 9e33317..b385f62 100644
--- a/PyQt4.spec
+++ b/PyQt4.spec
@@ -8,7 +8,7 @@
 Summary: Python bindings for Qt4
 Name: 	 PyQt4
 Version: 4.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -21,8 +21,6 @@ Patch1:  PyQt-x11-gpl-4.4.4-64bit.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
 
@@ -93,7 +91,6 @@ from any of the Qt4 classes (e.g. KDE or your own).
 %patch1 -p1 -b .64bit
 %patch4 -p1 
 %patch5 -p1 -b .timestamp
-%patch6 -p1 -b .fix-implicit-linking
 
 ## permissions
 # mark examples non-executable
@@ -243,6 +240,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.8-3
+- fix pyuic_shbang.patch
+- drop implicit-linking patch (no longer needed)
+
 * Sun Oct 24 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.8-2
 - drop BR: qt-assistant-adp-devel (these deprecated bindings are no longer included)