From c3d26e7c6d3395c73379d6c507470a7806ce76e4 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 12 Aug 2019 13:27:48 +0200 Subject: [PATCH] Fix mingw-find-debuginfo.sh to pick up strippable binaries also in %%{_prefix}/%%{mingw32,64_target} --- mingw-filesystem.spec | 7 +++++-- mingw-find-debuginfo.sh | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec index cd8719c..cd0e5d3 100644 --- a/mingw-filesystem.spec +++ b/mingw-filesystem.spec @@ -6,8 +6,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: mingw-filesystem -Version: 107 -Release: 2%{?dist} +Version: 108 +Release: 1%{?dist} Summary: MinGW cross compiler base filesystem and environment License: GPLv2+ @@ -316,6 +316,9 @@ install -m 0644 %{SOURCE19} $RPM_BUILD_ROOT%{_datadir}/mingw/ %changelog +* Mon Aug 12 2019 Sandro Mani - 108-1 +- Fix mingw-find-debuginfo.sh to pick up strippable binaries also in %%{_prefix}/%%{mingw32,64_target} + * Thu Jul 25 2019 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh index 261385f..f877343 100755 --- a/mingw-find-debuginfo.sh +++ b/mingw-find-debuginfo.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/sh # mingw-find-debuginfo.sh - automagically generate debug info and file list # for inclusion in an rpm spec file for mingw-* packages. @@ -33,7 +33,7 @@ do done for target in $@; do - prefix=`rpm --eval "%{${target}_prefix}"` + prefix=`rpm --eval "%{_prefix}/%{${target}_target}"` if [ ! -d $RPM_BUILD_ROOT$prefix ] ; then continue fi