rpms/mingw32-qt/F-11 .cvsignore, 1.2, 1.3 mingw32-qt.spec, 1.3, 1.4 sources, 1.2, 1.3

[sailer]

Author: sailer

Update of /cvs/pkgs/rpms/mingw32-qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv635

Modified Files:
	.cvsignore mingw32-qt.spec sources 
Log Message:
update to match native



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qt/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	16 Mar 2009 02:31:08 -0000	1.2
+++ .cvsignore	16 Jun 2009 12:54:11 -0000	1.3
@@ -1 +1 @@
-qt-win-opensource-src-4.5.0.zip
+qt-win-opensource-src-4.5.1.zip


Index: mingw32-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qt/F-11/mingw32-qt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-qt.spec	31 Mar 2009 20:13:29 -0000	1.3
+++ mingw32-qt.spec	16 Jun 2009 12:54:11 -0000	1.4
@@ -1,8 +1,8 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
+%global __strip %{_mingw32_strip}
+%global __objdump %{_mingw32_objdump}
+%global _use_internal_dependency_generator 0
+%global __find_requires %{_mingw32_findrequires}
+%global __find_provides %{_mingw32_findprovides}
 
 # NOTES, please read these carefully first:
 #
@@ -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/network src/xml src/xmlpatterns src/gui src/winmain src/svg src/sql src/qt3support src/opengl src/script src/scripttools
+%global 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:        4%{?dist}
+Version:        4.5.1
+Release:        1%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -162,9 +162,10 @@ mkdir -p $RPM_BUILD_ROOT%{_mingw32_inclu
 mv $RPM_BUILD_ROOT%{_includedir}/* $RPM_BUILD_ROOT%{_mingw32_includedir}
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
-mv $RPM_BUILD_ROOT%{_libdir}/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
+mv $RPM_BUILD_ROOT%{_libdir}/qt4/bin/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
+mv $RPM_BUILD_ROOT/usr/lib/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
 mv $RPM_BUILD_ROOT%{_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
-rm $RPM_BUILD_ROOT%{_libdir}/qt4/bin/*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/qt4/bin
 rm $RPM_BUILD_ROOT%{_libdir}/*.prl
 
 
@@ -237,6 +238,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.1-1
+- Update to Qt 4.5.1.
+- Location of *.dll files moved again.
+- No longer necessary to remove libdir/qt4/bin.
+- Installs more *.dll files in /usr/lib [sic].
+- replace %%define with %%global
+
 * 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.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qt/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	16 Mar 2009 02:31:08 -0000	1.2
+++ sources	16 Jun 2009 12:54:11 -0000	1.3
@@ -1 +1 @@
-172c0157a4a53c362f780066ead9f88a  qt-win-opensource-src-4.5.0.zip
+ef2934257c893b7694437cc8d1e37bd9  qt-win-opensource-src-4.5.1.zip