From fb25dbbe0bb02d98393d680c738ea5d995e00f61 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Wed, 20 Jul 2011 13:02:38 -0500
Subject: [PATCH] reorg patch2/patch4

---
 qt.spec | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/qt.spec b/qt.spec
index d3a9710..f038728 100644
--- a/qt.spec
+++ b/qt.spec
@@ -386,6 +386,9 @@ Qt libraries used for drawing widgets and OpenGL items.
 %setup -q -n qt-everywhere-opensource-src-%{version}
 
 
+%patch2 -p1 -b .multilib-optflags
+# drop backup file(s), else they get installed too, http://bugzilla.redhat.com/639463
+rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 %patch4 -p1 -b .uic_multilib
 %patch15 -p1 -b .enable_ft_lcdfilter
 %patch23 -p1 -b .glib_eventloop_nullcheck
@@ -418,11 +421,6 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
 %define platform linux-g++
 %endif
 
-%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 \
   -e "s|-O2|$RPM_OPT_FLAGS|g" \
   -e "s|g++.conf|g++-multilib.conf|g" \