[qt] Release: 1 drop an old (unuseful) patch that no longer applies

[Rex Dieter]

commit d72d8fa9980dc3b554b3afd42bf42594a8992b73
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Mar 1 08:09:22 2011 -0600

    Release: 1
    drop an old (unuseful) patch that no longer applies

 ...adds-support-for-using-isystem-to-allow-p.patch |   56 --------------------
 ...-opensource-src-4.7.1-assistant_no_webkit.patch |    0
 qt.spec                                            |    8 +--
 3 files changed, 3 insertions(+), 61 deletions(-)
---
diff --git a/qt-everywhere-opensource-src-4.7.1-webkit.patch b/qt-everywhere-opensource-src-4.7.1-assistant_no_webkit.patch
similarity index 100%
rename from qt-everywhere-opensource-src-4.7.1-webkit.patch
rename to qt-everywhere-opensource-src-4.7.1-assistant_no_webkit.patch
diff --git a/qt.spec b/qt.spec
index 9ade99e..7c4f187 100644
--- a/qt.spec
+++ b/qt.spec
@@ -18,7 +18,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.2
-Release: 18%{?dist}
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -57,7 +57,7 @@ Patch19: qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
 Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
 
 # remove dependency of webkit in assistant
-Patch24: qt-everywhere-opensource-src-4.7.1-webkit.patch
+Patch24: qt-everywhere-opensource-src-4.7.1-assistant_no_webkit.patch
 
 ## upstreamable bits
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
@@ -98,7 +98,6 @@ Patch105: qt-everywhere-opensource-src-4.7.1-webkit_debug_javascriptcore.patch
 
 # kde-qt git patches
 Patch202: 0002-This-patch-makes-override-redirect-windows-popup-men.patch
-Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
 Patch205: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
 Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
 
@@ -476,7 +475,7 @@ Qt libraries used for drawing widgets and OpenGL items.
 %patch19 -p1 -b .phonon_servicesfile
 %patch23 -p1 -b .glib_eventloop_nullcheck
 ## make -assistant subpkg instead (#660287#9)
-#patch24 -p1 -b .webkit
+#patch24 -p1 -b .assistant_no_webkit
 ## TODO: still worth carrying?  if so, upstream it.
 %patch53 -p1 -b .qatomic-inline-asm
 ## TODO: upstream me
@@ -498,7 +497,6 @@ Qt libraries used for drawing widgets and OpenGL items.
 # kde-qt branch
 %if 0%{?kde_qt}
 %patch202 -p1 -b .kde-qt-0002
-%patch204 -p1 -b .kde-qt-0004
 %patch205 -p1 -b .kde-qt-0005
 %patch212 -p1 -b .kde-qt-0012
 %endif