diff --git a/qt.spec b/qt.spec index 4f74b82..b668e29 100644 --- a/qt.spec +++ b/qt.spec @@ -142,8 +142,8 @@ Patch84: qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch Patch86: qt-everywhere-opensource-src-4.8.6-systemtrayicon.patch # fixes for LibreOffice from the upstream Qt bug tracker (#1105422): -Patch87: qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch -Patch88: qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch +Patch87: qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch +Patch88: qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch Patch89: qt-everywhere-opensource-src-4.8.6-QTBUG-38585.patch # upstream patches @@ -524,8 +524,8 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags %patch81 -p1 -b .assistant-crash %patch82 -p1 -b .QTBUG-4862 %patch83 -p1 -b .poll -%patch87 -p0 -b .QTBUG-34614 -%patch88 -p1 -b .QTBUG-37380 +%patch87 -p1 -b .QTBUG-37380 +%patch88 -p0 -b .QTBUG-34614 %patch89 -p0 -b .QTBUG-38585 # upstream patches @@ -1237,7 +1237,7 @@ fi %changelog -* Fri Jun 06 2014 Kevin Kofler 4.8.6-9 +* Sat Jun 07 2014 Kevin Kofler 4.8.6-9 - apply proposed fixes for QTBUG-34614,37380,38585 for LibreOffice (#1105422) * Tue Jun 03 2014 Rex Dieter 4.8.6-8