rpms/mingw32-qt-qmake/devel mingw32-qt-qmake.spec, 1.8, 1.9 qplatformdefs.h, 1.1, 1.2

[sailer]

Author: sailer

Update of /cvs/extras/rpms/mingw32-qt-qmake/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24720

Modified Files:
	mingw32-qt-qmake.spec qplatformdefs.h 
Log Message:
update to 4.6.0beta1



Index: mingw32-qt-qmake.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt-qmake/devel/mingw32-qt-qmake.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mingw32-qt-qmake.spec	2 Nov 2009 23:11:21 -0000	1.8
+++ mingw32-qt-qmake.spec	17 Nov 2009 12:32:11 -0000	1.9
@@ -6,9 +6,14 @@
 
 %global debug_package %{nil}
 
+%global pre beta1
+
+%global platform win32-fedora-cross
+%global compatplatform fedora-win32-cross
+
 Name:           mingw32-qt-qmake
-Version:        4.5.3
-Release:        1%{?dist}
+Version:        4.6.0
+Release:        0.1.%{pre}%{?dist}
 Summary:        Qt for Windows Build Environment
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -45,9 +50,14 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE4} .
 rm -rf $RPM_BUILD_ROOT
 
 # Cross-compiler qmake specs.
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/qt4/mkspecs/fedora-win32-cross
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/qt4/mkspecs/%{platform}
 cp %{SOURCE0} %{SOURCE1} \
-  $RPM_BUILD_ROOT%{_libdir}/qt4/mkspecs/fedora-win32-cross
+  $RPM_BUILD_ROOT%{_libdir}/qt4/mkspecs/%{platform}
+%if 0%{?compatplatform:1}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/qt4/mkspecs/%{compatplatform}
+cp %{SOURCE0} %{SOURCE1} \
+  $RPM_BUILD_ROOT%{_libdir}/qt4/mkspecs/%{compatplatform}
+%endif
 
 
 %clean
@@ -57,10 +67,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL
-%{_libdir}/qt4/mkspecs/fedora-win32-cross
+%{_libdir}/qt4/mkspecs/%{platform}
+%if 0%{?compatplatform:1}
+%{_libdir}/qt4/mkspecs/%{compatplatform}
+%endif
 
 
 %changelog
+* Tue Nov 17 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.6.0-0.1.beta1
+- update to 4.6.0
+
 * Mon Nov  3 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.3-1
 - update to 4.5.3 to match mingw32-qt version
 


Index: qplatformdefs.h
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt-qmake/devel/qplatformdefs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qplatformdefs.h	16 Mar 2009 02:07:56 -0000	1.1
+++ qplatformdefs.h	17 Nov 2009 12:32:12 -0000	1.2
@@ -56,7 +56,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <stdlib.h>
-#include <windows.h>
+#include <qt_windows.h>
 #include <limits.h>
 
 #if !defined(_WIN32_WINNT) || (_WIN32_WINNT-0 < 0x0500)