[mingw-qt: 29/65] - Enable the 'windowsxp' and 'windowsvista' styles - Fixed the %defattr

[epienbro]

commit 2d72cd97676a4217164b434b200dde009bccb2c3
Author: epienbro <epienbro at fedoraproject.org>
Date:   Sun Jun 27 11:56:54 2010 +0000

    - Enable the 'windowsxp' and 'windowsvista' styles
    - Fixed the %defattr

 mingw32-qt.spec     |    8 ++++++--
 qmake.cache.in      |    2 +-
 qt-win-configure.sh |    1 +
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 26f5008..0531e96 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -26,7 +26,7 @@
 
 Name:           mingw32-qt
 Version:        4.6.2
-Release:        1%{?pre}%{?dist}
+Release:        2%{?pre}%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -207,7 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc configure.output
 %doc LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt README
 %{_mingw32_bindir}/Qt3Support4.dll
@@ -288,6 +288,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 27 2010 Erik van Pienbroek <epienbro at fedoraproject.org> - 4.6.2-2
+- Enable the 'windowsxp' and 'windowsvista' styles
+- Fixed the %%defattr
+
 * Fri Feb 26 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.2-1
 - update to 4.6.2
 
diff --git a/qmake.cache.in b/qmake.cache.in
index a1a94cd..af3b504 100644
--- a/qmake.cache.in
+++ b/qmake.cache.in
@@ -3,7 +3,7 @@ OBJECTS_DIR     = @builddir@/tmp/obj/release_shared
 MOC_DIR         = @builddir@/tmp/moc/release_shared
 RCC_DIR         = @builddir@/tmp/rcc/release_shared
 sql-plugins    += sqlite
-styles         += windows plastique cleanlooks motif cde
+styles         += windows plastique cleanlooks windowsxp windowsvista motif cde
 imageformat-plugins += gif tiff jpeg
 CONFIG         += dist-config large-config medium-config minimal-config small-config full-config release incremental create_prl link_prl depend_includepath QTDIR_build
 QT_BUILD_PARTS  = libs tools examples demos docs translations
diff --git a/qt-win-configure.sh b/qt-win-configure.sh
index e9976f7..7c0f9ce 100755
--- a/qt-win-configure.sh
+++ b/qt-win-configure.sh
@@ -58,6 +58,7 @@ echo "o" | wine configure.exe \
   -translationdir $(rpm --eval %{_mingw32_datadir})/qt4/translations \
   -no-mmx -no-sse -no-sse2 \
   -release \
+  -qt-style-windowsxp -qt-style-windowsvista \
   -shared > configure.output 2>&1
 
 cd ..