commit 48c863550e12cb7fb71e3afcb7cdc852c8716e99 Author: Kalev Lember kalev@smartlink.ee Date: Tue May 24 10:54:33 2011 +0300

Make sure the -debuginfo subpackages are mingw32- prefixed

... even if the base package is mingw-. Latest Fedora MinGW packaging guidelines allow the base (source) package be named mingw-, but all binary packages should be mingw32-.

http://lists.fedoraproject.org/pipermail/mingw/2011-May/003708.html

macros.mingw32 | 11 +++++++---- mingw32-filesystem.spec | 6 +++++- 2 files changed, 12 insertions(+), 5 deletions(-) --- diff --git a/macros.mingw32 b/macros.mingw32 index aa75be7..e65767f 100644 --- a/macros.mingw32 +++ b/macros.mingw32 @@ -1,5 +1,7 @@ # RPM macros for Fedora MinGW.

+%_mingw32_pkg_name %(echo %{name} | sed 's/^mingw-/mingw32-/') + %_mingw32_target i686-pc-mingw32

# Paths. @@ -60,14 +62,15 @@

# Template for debug sub-package. %_mingw32_debug_package(n:) \ -%package %{-n:-n %{-n*}-}debuginfo \ +%define __mingw32_debug_pkg_name %{-n*}%{!-n:%{_mingw32_pkg_name}}-debuginfo \ +%package -n %{__mingw32_debug_pkg_name} \ Summary: Debug information for package %{name} \ Group: Development/Debug \ -%description %{-n:-n %{-n*}-}debuginfo \ -This package provides debug information for package %{name}.\ +%description -n %{__mingw32_debug_pkg_name} \ +This package provides debug information for package %{_mingw32_pkg_name}.\ Debug information is useful when developing applications that use this\ package or when debugging this package.\ -%files debuginfo -f debugfiles.list\ +%files -n %{__mingw32_debug_pkg_name} -f debugfiles.list\ %defattr(-,root,root,-)\ %{nil}

diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec index 4fe0847..537ba73 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@

Name: mingw32-filesystem Version: 64 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment

Group: Development/Libraries @@ -167,6 +167,10 @@ rm -rf $RPM_BUILD_ROOT

%changelog +* Sun May 29 2011 Kalev Lember kalev@smartlink.ee - 64-2 +- Make sure the -debuginfo subpackages are mingw32- prefixed + even if the base package is mingw- + * Sun Nov 14 2010 Ivan Romanov drizt@land.ru 64-1 - Removed -win32 option for mingw32-qmake-qt4 (is obsoletes since qt version 4.7.0) - Using win32-g++-fedora-cross instead fedora-win32-cross spec file