- apply QMAKEPATH portion of multilib patch only if needed

- qt-copy-patches-20080908

.cvsignore

@@ -1,4 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.1.tar.bz2
-qt-copy-patches-20080805svn.tar.bz2
+qt-copy-patches-20080908svn.tar.bz2

qt-x11-opensource-src-4.2.2-multilib-optflags.patch

@@ -0,0 +1,33 @@
+--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
++++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf	2007-02-26 15:01:02.000000000 -0600
+@@ -14,6 +14,8 @@
+ QMAKE_CFLAGS		= -m64
+ QMAKE_LFLAGS		= -m64
+ 
++QMAKE_CFLAGS_RELEASE	+= -O2
++
+ include(../common/g++.conf)
+ include(../common/linux.conf)
+ 
+--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
++++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf	2007-02-26 15:01:34.000000000 -0600
+@@ -11,6 +11,8 @@
+ QMAKE_CFLAGS		= -m32
+ QMAKE_LFLAGS		= -m32
+ 
++QMAKE_CFLAGS_RELEASE	+= -O2
++
+ include(../common/g++.conf)
+ include(../common/linux.conf)
+ load(qt_config)
+--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
++++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf	2007-02-26 15:01:26.000000000 -0600
+@@ -8,6 +8,8 @@
+ QT			+= core gui
+ QMAKE_INCREMENTAL_STYLE = sublib
+ 
++QMAKE_CFLAGS_RELEASE	+= -O2
++
+ include(../common/g++.conf)
+ include(../common/linux.conf)
+ load(qt_config)

qt.spec

@@ -9,7 +9,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -30,7 +30,8 @@ Source4: Trolltech.conf
 Source5: qconfig-multilib.h
 
 # multilib hacks 
-Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
+Patch2: qt-x11-opensource-src-4.2.2-multilib-optflags.patch
+Patch3: qt-x11-opensource-src-4.2.2-multilib-QMAKEPATH.patch
 Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
 # kill hardcoded font substitutions (#447298)
 Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch
@@ -40,7 +41,7 @@ Patch9: qt-x11-opensource-src-4.4.0-qgtkstyle.patch
 Patch10: qt-x11-opensource-src-4.4.1-systray.patch
 
 ## qt-copy patches
-%define qt_copy 20080805
+%define qt_copy 20080908
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -269,12 +270,19 @@ Qt libraries which are used for drawing widgets and OpenGL items.
 %setup -q -n qt-x11-opensource-src-%{version}%{?pre} %{?qt_copy:-a 2}
 
 %if 0%{?qt_copy:1}
+# Mac(?)-specific, doesn't apply
+echo "0242" >> patches/DISABLED
+# already(?) applied to 4.4.1
+echo "0244" >> patches/DISABLED
 test -x apply_patches && ./apply_patches
 %endif
 
 # don't use -b on mkspec files, else they get installed too.
 # multilib hacks no longer required
 %patch2 -p1
+%if "%{_qt4_datadir}" != "%{_qt4_prefix}"
+%patch3 -p1 -b .multilib-QMAKEPATH
+%endif
 %patch5 -p1 -b .bz#437440-as_IN-437440
 %patch8 -p1 -b .font-aliases
 %patch9 -p1 -b .qgtkstyle
@@ -726,6 +734,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %changelog
+* Mon Sep 08 2008 Rex Dieter <rdieter@fedoraproject.org> - 4.4.1-3
+- apply QMAKEPATH portion of multilib patch only if needed
+- qt-copy-patches-20080908
+
 * Wed Aug 06 2008 Than Ngo <than@redhat.com> -  4.4.1-2
 - fix license tag
 - fix Obsoletes: qt-sqlite (missing epoch)

sources

@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 a94a6f5ef01598bb9980891f2515ff45  qt-x11-opensource-src-4.4.1.tar.bz2
-21597a6486886398a7b771d240ad346b  qt-copy-patches-20080805svn.tar.bz2
+ab07c997ab770a4b2c5f8838b7fb4a0e  qt-copy-patches-20080908svn.tar.bz2