[qt] - qt-devel contains residues from patch run (#639463)

[Rex Dieter]

commit a941a58f4fb5e5824e848a37c1c3307c86092199
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 18 11:15:18 2010 -0500

    - qt-devel contains residues from patch run (#639463)

 qt.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/qt.spec b/qt.spec
index 5473e80..5d6c3b5 100644
--- a/qt.spec
+++ b/qt.spec
@@ -18,7 +18,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.0
-Release: 6%{?dist}
+Release: 7%{?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
@@ -470,9 +470,10 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
 %endif
 
 # multilib hacks
-# don't use -b on mkspec files, else they get installed too.
 # multilib hacks no longer required
-%patch2 -p1
+%patch2 -p1 -b .multilib
+# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
+rm -fv mkspecs/linux-g++*/qmake.conf.multilib
 %patch4 -p1 -b .uic_multilib
 
 sed -i \
@@ -1105,6 +1106,9 @@ fi
 
 
 %changelog
+* Mon Oct 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.7.0-7
+- qt-devel contains residues from patch run (#639463)
+
 * Fri Oct 15 2010 Than Ngo <than at redhat.com> - 4.7.0-6
 - apply patch to fix the color issue in 24bit mode (cirrus driver)