rpms/mingw32-qt/devel mingw32-qt.spec,1.2,1.3

[Thomas M. Sailer]

Author: sailer

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

Modified Files:
	mingw32-qt.spec 
Log Message:
Patch from Kalev Lember:

Hello,

I have attached a patch that enables building of QtOpenGL, QtScript,
QtScriptTools, and QtXmlPatterns in mingw32-qt package. Could you update
the package in rawhide and include this patch?

Spec file: http://www.smartlink.ee/~kalev/mingw32-qt.spec
Source RPM: http://www.smartlink.ee/~kalev/mingw32-qt-4.5.0-4.fc11.src.rpm

Koji scratch build:
http://koji.fedoraproject.org/koji/taskinfo?taskID=1268407



Index: mingw32-qt.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/devel/mingw32-qt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mingw32-qt.spec	16 Mar 2009 02:31:08 -0000	1.2
+++ mingw32-qt.spec	31 Mar 2009 20:13:29 -0000	1.3
@@ -13,11 +13,11 @@
 #   from the native Fedora package.  The reason is so that we can
 #   set the default include and library paths correctly.
 
-%define subdirs src/corelib src/xml src/network src/gui src/winmain src/svg src/sql src/qt3support
+%define subdirs src/corelib src/network src/xml src/xmlpatterns src/gui src/winmain src/svg src/sql src/qt3support src/opengl src/script src/scripttools
 
 Name:           mingw32-qt
 Version:        4.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -176,47 +176,71 @@
 %defattr(-,root,root)
 %doc configure.output
 %doc LICENSE.GPL3 LICENSE.LGPL LGPL_EXCEPTION.txt KNOWN.ISSUES README
-%{_mingw32_bindir}/QtCore4.dll
-%{_mingw32_bindir}/QtGui4.dll
-%{_mingw32_bindir}/QtNetwork4.dll
-%{_mingw32_bindir}/QtXml4.dll
-%{_mingw32_bindir}/QtSvg4.dll
-%{_mingw32_bindir}/QtSql4.dll
 %{_mingw32_bindir}/Qt3Support4.dll
+%{_mingw32_bindir}/Qt3Supportd4.dll
+%{_mingw32_bindir}/QtCore4.dll
 %{_mingw32_bindir}/QtCored4.dll
+%{_mingw32_bindir}/QtGui4.dll
 %{_mingw32_bindir}/QtGuid4.dll
+%{_mingw32_bindir}/QtNetwork4.dll
 %{_mingw32_bindir}/QtNetworkd4.dll
-%{_mingw32_bindir}/QtXmld4.dll
-%{_mingw32_bindir}/QtSvgd4.dll
+%{_mingw32_bindir}/QtOpenGL4.dll
+%{_mingw32_bindir}/QtOpenGLd4.dll
+%{_mingw32_bindir}/QtScript4.dll
+%{_mingw32_bindir}/QtScriptd4.dll
+%{_mingw32_bindir}/QtScriptTools4.dll
+%{_mingw32_bindir}/QtScriptToolsd4.dll
+%{_mingw32_bindir}/QtSql4.dll
 %{_mingw32_bindir}/QtSqld4.dll
-%{_mingw32_bindir}/Qt3Supportd4.dll
-%{_mingw32_libdir}/libQtCore4.a
-%{_mingw32_libdir}/libQtGui4.a
-%{_mingw32_libdir}/libQtNetwork4.a
-%{_mingw32_libdir}/libQtXml4.a
-%{_mingw32_libdir}/libQtSvg4.a
-%{_mingw32_libdir}/libQtSql4.a
+%{_mingw32_bindir}/QtSvg4.dll
+%{_mingw32_bindir}/QtSvgd4.dll
+%{_mingw32_bindir}/QtXml4.dll
+%{_mingw32_bindir}/QtXmld4.dll
+%{_mingw32_bindir}/QtXmlPatterns4.dll
+%{_mingw32_bindir}/QtXmlPatternsd4.dll
 %{_mingw32_libdir}/libQt3Support4.a
-%{_mingw32_libdir}/libqtmain.a
+%{_mingw32_libdir}/libQt3Supportd4.a
+%{_mingw32_libdir}/libQtCore4.a
 %{_mingw32_libdir}/libQtCored4.a
+%{_mingw32_libdir}/libQtGui4.a
 %{_mingw32_libdir}/libQtGuid4.a
+%{_mingw32_libdir}/libqtmain.a
+%{_mingw32_libdir}/libqtmaind.a
+%{_mingw32_libdir}/libQtNetwork4.a
 %{_mingw32_libdir}/libQtNetworkd4.a
-%{_mingw32_libdir}/libQtXmld4.a
-%{_mingw32_libdir}/libQtSvgd4.a
+%{_mingw32_libdir}/libQtOpenGL4.a
+%{_mingw32_libdir}/libQtOpenGLd4.a
+%{_mingw32_libdir}/libQtScript4.a
+%{_mingw32_libdir}/libQtScriptd4.a
+%{_mingw32_libdir}/libQtScriptTools4.a
+%{_mingw32_libdir}/libQtScriptToolsd4.a
+%{_mingw32_libdir}/libQtSql4.a
 %{_mingw32_libdir}/libQtSqld4.a
-%{_mingw32_libdir}/libQt3Supportd4.a
-%{_mingw32_libdir}/libqtmaind.a
+%{_mingw32_libdir}/libQtSvg4.a
+%{_mingw32_libdir}/libQtSvgd4.a
+%{_mingw32_libdir}/libQtXml4.a
+%{_mingw32_libdir}/libQtXmld4.a
+%{_mingw32_libdir}/libQtXmlPatterns4.a
+%{_mingw32_libdir}/libQtXmlPatternsd4.a
 %{_mingw32_includedir}/Qt/
+%{_mingw32_includedir}/Qt3Support/
 %{_mingw32_includedir}/QtCore/
 %{_mingw32_includedir}/QtGui/
 %{_mingw32_includedir}/QtNetwork/
-%{_mingw32_includedir}/QtXml/
-%{_mingw32_includedir}/QtSvg/
+%{_mingw32_includedir}/QtOpenGL/
+%{_mingw32_includedir}/QtScript/
+%{_mingw32_includedir}/QtScriptTools/
 %{_mingw32_includedir}/QtSql/
-%{_mingw32_includedir}/Qt3Support/
+%{_mingw32_includedir}/QtSvg/
+%{_mingw32_includedir}/QtXml/
+%{_mingw32_includedir}/QtXmlPatterns/
 
 
 %changelog
+* Tue Mar 31 2009 Kalev Lember <kalev at smartlink.ee> - 4.5.0-4
+- Enable QtOpenGL, QtScript, QtScriptTools, and QtXmlPatterns.
+- Sort files section for readability.
+
 * Sun Mar 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.0-3
 - moved cross compiler qmake setup files into separate package
   to keep this package noarch