[mingw-qt5-qtquick1] Dropped manual rename of import libraries

Erik van Pienbroek epienbro at fedoraproject.org
Wed Jan 8 19:22:18 UTC 2014


commit 3eca1aacee156e58c23fd1211d138cff0ed1060e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Jan 8 20:22:24 2014 +0100

    Dropped manual rename of import libraries

 mingw-qt5-qtquick1.spec |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/mingw-qt5-qtquick1.spec b/mingw-qt5-qtquick1.spec
index a633212..e4e1610 100644
--- a/mingw-qt5-qtquick1.spec
+++ b/mingw-qt5-qtquick1.spec
@@ -17,7 +17,7 @@
 
 Name:           mingw-qt5-%{qt_module}
 Version:        5.2.0
-Release:        1%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
 Summary:        Qt5 for Windows - QtQuick1 component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -101,12 +101,6 @@ Fedora Windows cross-compiler.
 # .prl files aren't interesting for us
 find $RPM_BUILD_ROOT -name "*.prl" -delete
 
-# Rename the .a files to .dll.a as they're actually import libraries and not static libraries
-for FN in $RPM_BUILD_ROOT%{mingw32_libdir}/*.a $RPM_BUILD_ROOT%{mingw64_libdir}/*.a ; do
-    FN_NEW=$(echo $FN | sed s/'.a$'/'.dll.a'/)
-    mv $FN $FN_NEW
-done
-
 # The .dll's are installed in both %%{mingw32_bindir} and %%{mingw32_libdir}
 # One copy of the .dll's is sufficient
 rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll
@@ -153,6 +147,9 @@ mv $RPM_BUILD_ROOT%{mingw64_bindir}/qmlviewer.exe $RPM_BUILD_ROOT%{mingw64_bindi
 
 
 %changelog
+* Wed Jan  8 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-2
+- Dropped manual rename of import libraries
+
 * Sun Jan  5 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-1
 - Update to 5.2.0
 


More information about the scm-commits mailing list