diff --git a/mingw-qt5-qtlocation.spec b/mingw-qt5-qtlocation.spec index eaddff7..347efa2 100644 --- a/mingw-qt5-qtlocation.spec +++ b/mingw-qt5-qtlocation.spec @@ -17,7 +17,7 @@ Name: mingw-qt5-%{qt_module} Version: 5.2.0 -Release: 2%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist} +Release: 3%{?pre:.%{pre}}%{?snapshot_date:.git%{snapshot_date}.%{snapshot_rev}}%{?dist} Summary: Qt5 for Windows - QtLocation component License: GPLv3 with exceptions or LGPLv2 with exceptions @@ -110,9 +110,18 @@ find $RPM_BUILD_ROOT -name "*.prl" -delete rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.dll rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll +# Create a list of .dll.debug files which need to be excluded from the main packages +# We do this to keep the %%files section as clean/readable as possible (otherwise every +# single file and directory would have to be mentioned individually in the %%files section) +# 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 + # Win32 -%files -n mingw32-qt5-%{qt_module} +%files -n mingw32-qt5-%{qt_module} -f mingw32-qt5-%{qt_module}.excludes %{mingw32_bindir}/Qt5Location.dll %{mingw32_bindir}/Qt5Positioning.dll %{mingw32_includedir}/qt5/QtLocation/ @@ -133,7 +142,7 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll %{mingw32_datadir}/qt5/mkspecs/modules/qt_lib_positioning_private.pri # Win64 -%files -n mingw64-qt5-%{qt_module} +%files -n mingw64-qt5-%{qt_module} -f mingw64-qt5-%{qt_module}.excludes %{mingw64_bindir}/Qt5Location.dll %{mingw64_bindir}/Qt5Positioning.dll %{mingw64_includedir}/qt5/QtLocation/ @@ -155,6 +164,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.dll %changelog +* Sun Jan 12 2014 Erik van Pienbroek - 5.2.0-3 +- Don't carry .dll.debug files in main package + * Wed Jan 8 2014 Erik van Pienbroek - 5.2.0-2 - Dropped manual rename of import libraries