[mingw-qt: 13/65] hopefully fix the 32 vs 64 bit builder issue for good

epienbro epienbro at fedoraproject.org
Tue Mar 6 21:27:50 UTC 2012


commit c6e130ea929bf4d7d5ad88d19546e798c038131e
Author: sailer <sailer at fedoraproject.org>
Date:   Thu Jun 25 16:43:21 2009 +0000

    hopefully fix the 32 vs 64 bit builder issue for good

 mingw32-qt.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index 6c1b68e..8b0f0c6 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -18,7 +18,7 @@
 
 Name:           mingw32-qt
 Version:        4.5.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -167,8 +167,8 @@ 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}/qt4/bin/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-mv $RPM_BUILD_ROOT%{_libdir}/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-mv $RPM_BUILD_ROOT%{_libdir}/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
+mv $RPM_BUILD_ROOT/usr/lib*/*.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
+mv $RPM_BUILD_ROOT/usr/lib*/*.a $RPM_BUILD_ROOT%{_mingw32_libdir}
 rm -rf $RPM_BUILD_ROOT%{_libdir}/qt4/bin
 rm $RPM_BUILD_ROOT%{_libdir}/*.prl
 
@@ -242,6 +242,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 25 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.1-7
+- hopefully finally solve the 32 vs 64 bit builder issues
+
 * Mon Jun 22 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.1-6
 - add debuginfo packages
 


More information about the scm-commits mailing list