[mingw-qt5-qtbase] Removed DBus 'interface' workaround patch as the issue is resolved in DBus upstream

[Erik van Pienbroek]

commit 7e82a1fe779f86de9dc7e45879eb31e36d1dded0
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Sep 12 22:29:53 2013 +0200

    Removed DBus 'interface' workaround patch as the issue is resolved in DBus upstream

 mingw-qt5-qtbase.spec                             |   11 ++++-------
 qt5-prevent-conflict-with-interface-keyword.patch |   14 --------------
 2 files changed, 4 insertions(+), 21 deletions(-)
---
diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec
index 5a3f2a6..b63f9ff 100644
--- a/mingw-qt5-qtbase.spec
+++ b/mingw-qt5-qtbase.spec
@@ -23,7 +23,7 @@
 
 Name:           mingw-qt5-qtbase
 Version:        5.1.1
-Release:        1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
 Summary:        Qt5 for Windows - QtBase component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -65,11 +65,6 @@ Patch12:        qt5-define-qt-needs-qmain-for-win32-g++-targets.patch
 # https://bugreports.qt-project.org/browse/QTBUG-29426
 Patch13:        qt5-workaround-qtbug-29426.patch
 
-# While building qdbusviewer (part of mingw-qt5-qttools) the build fails
-# because various QtDBus headers use the keyword 'interface' which is a
-# reserved keyword on Win32 environments (defined in rpc.h)
-Patch14:        qt5-prevent-conflict-with-interface-keyword.patch
-
 # Make sure the .pc files of the Qt5 modules are installed correctly
 # This should prevent (silent) failures like:
 # sed -e "s,/usr/i686-w64-mingw32/sys-root/mingw/include,/usr/i686-w64-mingw32/sys-root/mingw/include/qt5,g" -e "s,/usr/i686-w64-mingw32/sys-root/mingw/lib,/usr/i686-w64-mingw32/sys-root/mingw/lib,g" "../../../build_win32/lib/pkgconfig/Qt5AxContainer.pc" >"/home/erik/rpmbuild/BUILDROOT/mingw-qt5-qtactiveqt-5.0.1-1.fc18.x86_64/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/Qt5AxContainer.pc"
@@ -258,7 +253,6 @@ Static version of the mingw64-qt5-qtbase library.
 %patch11 -p0 -b .platform_segv
 %patch12 -p0 -b .qt_needs_qmain
 %patch13 -p0 -b .non_x86
-%patch14 -p0 -b .interface
 %patch15 -p0 -b .pkgconfig
 %patch16 -p1 -b .no_freetype
 %patch18 -p1 -b .pcre
@@ -748,6 +742,9 @@ sed -i s@'#QT_TOOL'@'QT_TOOL'@ $RPM_BUILD_ROOT%{mingw64_datadir}/qt5/mkspecs/%{p
 
 
 %changelog
+* Thu Sep 12 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.1-2
+- Removed DBus 'interface' workaround patch as the issue is resolved in DBus upstream
+
 * Thu Aug 29 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.1.1-1
 - Update to 5.1.1
 - Fix FTBFS against latest mingw-w64