commit 6c4ae8c1dfa360d6c689506b074761185059e7c2
Author: Kalev Lember <kalevlember at gmail.com>
Date: Mon Aug 29 10:01:06 2011 +0300
Avoid including .dll.debug files in the main package
As a fix, list individual DLL files explicitly in %files. This is
annoyingly verbose, but also has the positive side effect of catching
accidentally removed plugin DLLs.
$ rpm -qpl mingw32-qt-4.7.3-1.fc16.noarch.rpm | grep '\.debug$'
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/accessible/qtaccessiblecompatwidgetsd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/accessible/qtaccessiblewidgetsd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/bearer/qgenericbearerd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/bearer/qnativewifibearerd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/codecs/qcncodecsd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/codecs/qjpcodecsd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/codecs/qkrcodecsd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/codecs/qtwcodecsd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/graphicssystems/qglgraphicssystemd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/graphicssystems/qtracegraphicssystemd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/iconengines/qsvgicond4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/imageformats/qgifd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/imageformats/qicod4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/imageformats/qjpegd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/imageformats/qmngd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/imageformats/qsvgd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/imageformats/qtiffd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/qmltooling/tcpserverd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/script/qtscriptdbusd4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/sqldrivers/qsqlited4.dll.debug
/usr/i686-pc-mingw32/sys-root/mingw/lib/qt4/plugins/sqldrivers/qsqlodbcd4.dll.debug
mingw32-qt.spec | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 2 deletions(-)
---
diff --git a/mingw32-qt.spec b/mingw32-qt.spec
index b350ab5..80e4f6c 100644
--- a/mingw32-qt.spec
+++ b/mingw32-qt.spec
@@ -8,7 +8,7 @@
Name: mingw32-qt
Version: 4.7.3
-Release: 1%{?pre}%{?dist}
+Release: 2%{?pre}%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -241,7 +241,59 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/imports
%{_mingw32_libdir}/libQtTestd4.a
%{_mingw32_libdir}/libQtWebKit4.a
%{_mingw32_libdir}/libQtWebKitd4.a
-%{_mingw32_libdir}/qt4/
+%dir %{_mingw32_libdir}/qt4
+%dir %{_mingw32_libdir}/qt4/plugins
+%dir %{_mingw32_libdir}/qt4/plugins/accessible
+%{_mingw32_libdir}/qt4/plugins/accessible/qtaccessiblecompatwidgets4.dll
+%{_mingw32_libdir}/qt4/plugins/accessible/qtaccessiblecompatwidgetsd4.dll
+%{_mingw32_libdir}/qt4/plugins/accessible/qtaccessiblewidgets4.dll
+%{_mingw32_libdir}/qt4/plugins/accessible/qtaccessiblewidgetsd4.dll
+%dir %{_mingw32_libdir}/qt4/plugins/bearer
+%{_mingw32_libdir}/qt4/plugins/bearer/qgenericbearer4.dll
+%{_mingw32_libdir}/qt4/plugins/bearer/qgenericbearerd4.dll
+%{_mingw32_libdir}/qt4/plugins/bearer/qnativewifibearer4.dll
+%{_mingw32_libdir}/qt4/plugins/bearer/qnativewifibearerd4.dll
+%dir %{_mingw32_libdir}/qt4/plugins/codecs
+%{_mingw32_libdir}/qt4/plugins/codecs/qcncodecs4.dll
+%{_mingw32_libdir}/qt4/plugins/codecs/qcncodecsd4.dll
+%{_mingw32_libdir}/qt4/plugins/codecs/qjpcodecs4.dll
+%{_mingw32_libdir}/qt4/plugins/codecs/qjpcodecsd4.dll
+%{_mingw32_libdir}/qt4/plugins/codecs/qkrcodecs4.dll
+%{_mingw32_libdir}/qt4/plugins/codecs/qkrcodecsd4.dll
+%{_mingw32_libdir}/qt4/plugins/codecs/qtwcodecs4.dll
+%{_mingw32_libdir}/qt4/plugins/codecs/qtwcodecsd4.dll
+%dir %{_mingw32_libdir}/qt4/plugins/graphicssystems
+%{_mingw32_libdir}/qt4/plugins/graphicssystems/qglgraphicssystem4.dll
+%{_mingw32_libdir}/qt4/plugins/graphicssystems/qglgraphicssystemd4.dll
+%{_mingw32_libdir}/qt4/plugins/graphicssystems/qtracegraphicssystem4.dll
+%{_mingw32_libdir}/qt4/plugins/graphicssystems/qtracegraphicssystemd4.dll
+%dir %{_mingw32_libdir}/qt4/plugins/iconengines
+%{_mingw32_libdir}/qt4/plugins/iconengines/qsvgicon4.dll
+%{_mingw32_libdir}/qt4/plugins/iconengines/qsvgicond4.dll
+%dir %{_mingw32_libdir}/qt4/plugins/imageformats
+%{_mingw32_libdir}/qt4/plugins/imageformats/qgif4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qgifd4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qico4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qicod4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qjpeg4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qjpegd4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qmng4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qmngd4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qsvg4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qsvgd4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qtiff4.dll
+%{_mingw32_libdir}/qt4/plugins/imageformats/qtiffd4.dll
+%dir %{_mingw32_libdir}/qt4/plugins/qmltooling
+%{_mingw32_libdir}/qt4/plugins/qmltooling/tcpserver4.dll
+%{_mingw32_libdir}/qt4/plugins/qmltooling/tcpserverd4.dll
+%dir %{_mingw32_libdir}/qt4/plugins/script
+%{_mingw32_libdir}/qt4/plugins/script/qtscriptdbus4.dll
+%{_mingw32_libdir}/qt4/plugins/script/qtscriptdbusd4.dll
+%dir %{_mingw32_libdir}/qt4/plugins/sqldrivers
+%{_mingw32_libdir}/qt4/plugins/sqldrivers/qsqlite4.dll
+%{_mingw32_libdir}/qt4/plugins/sqldrivers/qsqlited4.dll
+%{_mingw32_libdir}/qt4/plugins/sqldrivers/qsqlodbc4.dll
+%{_mingw32_libdir}/qt4/plugins/sqldrivers/qsqlodbcd4.dll
%{_mingw32_includedir}/Qt/
%{_mingw32_includedir}/Qt3Support/
%{_mingw32_includedir}/QtCore/
@@ -264,6 +316,10 @@ rm -rf $RPM_BUILD_ROOT%{_mingw32_prefix}/imports
%changelog
+* Mon Aug 29 2011 Kalev Lember <kalevlember at gmail.com> - 4.7.3-2
+- List individual dlls explicitly to avoid including .dll.debug files
+ in the main package
+
* Sun Aug 28 2011 Kalev Lember <kalevlember at gmail.com> - 4.7.3-1
- Update to 4.7.3
- Dropped upstreamed / unneeded patches