commit 74761330f7a14298bf52731aad9d40f70f1682b0 Author: Kalev Lember <kalev(a)smartlink.ee&gt; Date: Sun May 29 17:17:44 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 8bc6bbe..19ce4b8 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 %{-n:-n %{-n*}-}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 c33cf14..3b711eb 100644 --- a/mingw32-filesystem.spec +++ b/mingw32-filesystem.spec @@ -2,7 +2,7 @@ Name: mingw32-filesystem Version: 69 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW base filesystem and environment Group: Development/Libraries @@ -170,6 +170,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32 %changelog +* Sun May 29 2011 Kalev Lember <kalev(a)smartlink.ee&gt; - 69-2 +- Make sure the -debuginfo subpackages are mingw32- prefixed + even if the base package is mingw- + * Tue May 24 2011 Kalev Lember <kalev(a)smartlink.ee&gt; - 69-1 - Adjusted PKG_CONFIG_LIBDIR to also search in _mingw32_datadir/pkgconfig/ - Own the sbin/ directory