[mingw-qt5-qtquick1] Previous commit caused .dll.a files to disappear

Erik van Pienbroek epienbro at fedoraproject.org
Sat Feb 8 21:41:40 UTC 2014


commit 206c6c02c1f73707c081469221fd1a7d375ed89c
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Feb 8 22:42:15 2014 +0100

    Previous commit caused .dll.a files to disappear

 mingw-qt5-qtquick1.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/mingw-qt5-qtquick1.spec b/mingw-qt5-qtquick1.spec
index 1a26c5f..327d4ce 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:        3%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
+Release:        4%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist}
 Summary:        Qt5 for Windows - QtQuick1 component
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -116,8 +116,8 @@ mv $RPM_BUILD_ROOT%{mingw64_bindir}/qmlviewer.exe $RPM_BUILD_ROOT%{mingw64_bindi
 # Note: the .dll.debug files aren't created yet at this point (as it happens after
 # the %%install section). Therefore we have to assume that all .dll files will
 # eventually get a .dll.debug counterpart
-find $RPM_BUILD_ROOT%{mingw32_prefix} | grep .dll | sed s@"^$RPM_BUILD_ROOT"@"%%exclude "@ | sed s/".dll\$"/".dll.debug"/ > mingw32-qt5-%{qt_module}.excludes
-find $RPM_BUILD_ROOT%{mingw64_prefix} | grep .dll | sed s@"^$RPM_BUILD_ROOT"@"%%exclude "@ | sed s/".dll\$"/".dll.debug"/ > mingw64-qt5-%{qt_module}.excludes
+find $RPM_BUILD_ROOT%{mingw32_prefix} | grep .dll | grep -v .dll.a | sed s@"^$RPM_BUILD_ROOT"@"%%exclude "@ | sed s/".dll\$"/".dll.debug"/ > mingw32-qt5-%{qt_module}.excludes
+find $RPM_BUILD_ROOT%{mingw64_prefix} | grep .dll | grep -v .dll.a | sed s@"^$RPM_BUILD_ROOT"@"%%exclude "@ | sed s/".dll\$"/".dll.debug"/ > mingw64-qt5-%{qt_module}.excludes
 
 
 # Win32
@@ -156,6 +156,9 @@ find $RPM_BUILD_ROOT%{mingw64_prefix} | grep .dll | sed s@"^$RPM_BUILD_ROOT"@"%%
 
 
 %changelog
+* Sat Feb  8 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-4
+- Previous commit caused .dll.a files to disappear
+
 * Sun Jan 12 2014 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.2.0-3
 - Don't carry .dll.debug files in main package
 


More information about the scm-commits mailing list