rpms/mingw32-qt/devel mingw32-qt.spec, 1.24, 1.25 qmake.cache.in, 1.2, 1.3 qt-win-configure.sh, 1.9, 1.10

[epienbro]

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-qt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17408

Modified Files:
	mingw32-qt.spec qmake.cache.in qt-win-configure.sh 
Log Message:
- Enable the 'windowsxp' and 'windowsvista' styles
- Fixed the %defattr



Index: mingw32-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qt/devel/mingw32-qt.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- mingw32-qt.spec	26 Feb 2010 02:33:53 -0000	1.24
+++ mingw32-qt.spec	27 Jun 2010 11:56:53 -0000	1.25
@@ -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
 


Index: qmake.cache.in
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qt/devel/qmake.cache.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qmake.cache.in	18 Nov 2009 11:28:49 -0000	1.2
+++ qmake.cache.in	27 Jun 2010 11:56:53 -0000	1.3
@@ -3,7 +3,7 @@ OBJECTS_DIR     = @builddir@/tmp/obj/rel
 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


Index: qt-win-configure.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qt/devel/qt-win-configure.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- qt-win-configure.sh	26 Feb 2010 02:33:54 -0000	1.9
+++ qt-win-configure.sh	27 Jun 2010 11:56:54 -0000	1.10
@@ -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 ..