reorg patch2/patch4

This commit is contained in:
Rex Dieter 2011-07-20 13:02:38 -05:00
parent 3ecceb88be
commit fb25dbbe0b
1 changed files with 3 additions and 5 deletions

View File

@ -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" \