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

Erik van Pienbroek epienbro at fedoraproject.org
Tue Jan 7 06:46:02 UTC 2014


commit 08314fd37e3ad02fcc6cddd1296c6b5d18a7ccc7
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Tue Jan 7 07:46:01 2014 +0100

    Dropped manual rename of import libraries

 mingw-qt5-qttools.spec |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/mingw-qt5-qttools.spec b/mingw-qt5-qttools.spec
index 8e7f64f..1bd58ae 100644
--- a/mingw-qt5-qttools.spec
+++ b/mingw-qt5-qttools.spec
@@ -21,7 +21,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 - QtTools component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -132,15 +132,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
-    # With the exception of Qt5UiTools...
-    echo $FN | grep -q Qt5UiTools && continue
-
-    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
@@ -275,6 +266,9 @@ done
 
 
 %changelog
+* Tue Jan  7 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