From f278fdbb7dfa9eb5f36449a1008a49c0fe057525 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Feb 27 2012 17:01:13 +0000 Subject: Made the package compatible with the mingw-w64 toolchain and dropped unneeded RPM tags --- diff --git a/mingw32-crossreport.spec b/mingw32-crossreport.spec index 25eccc4..e0f9738 100644 --- a/mingw32-crossreport.spec +++ b/mingw32-crossreport.spec @@ -1,6 +1,6 @@ Name: mingw32-crossreport -Version: 7 -Release: 3%{?dist} +Version: 8 +Release: 1%{?dist} Summary: Analysis tool to help cross-compilation to Windows License: GPLv2+ @@ -11,7 +11,6 @@ Source1: README Source2: COPYING Source3: crossreport.db Source4: update-crossreport-db.pl -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -48,8 +47,6 @@ to substitute individual calls to work on Windows. %install -rm -rf $RPM_BUILD_ROOT - mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 %{SOURCE0} $RPM_BUILD_ROOT%{_bindir}/mingw32-crossreport @@ -68,12 +65,7 @@ pod2man -c "CrossReport" -r "%{name}-%{version}" %{SOURCE0} \ > $RPM_BUILD_ROOT%{_mandir}/man1/mingw32-crossreport.1 -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root) %doc %{_docdir}/%{name}-%{version}/COPYING %doc %{_docdir}/%{name}-%{version}/README %{_bindir}/mingw32-crossreport @@ -82,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 27 2012 Erik van Pienbroek - 8-1 +- Made the package compatible with the mingw-w64 toolchain +- Dropped unneeded RPM tags + * Fri Jan 13 2012 Fedora Release Engineering - 7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/update-crossreport-db.pl b/update-crossreport-db.pl index b03e66e..388da4c 100755 --- a/update-crossreport-db.pl +++ b/update-crossreport-db.pl @@ -55,7 +55,7 @@ I do not have a way to test this, so I print this note. EOT - my @implibs = ; + my @implibs = ; print "Analyzing ", 0+@implibs, " libraries ...\n"; @@ -72,7 +72,7 @@ EOT die "$implib: Cannot find RPM owning this file.\n" } - $cmd = "i686-pc-mingw32-nm $implib | grep ' [A-HJ-TV-Z] ' | i686-pc-mingw32-c++filt -_"; + $cmd = "i686-w64-mingw32-nm $implib | grep ' [A-HJ-TV-Z] ' | i686-w64-mingw32-c++filt -_"; open CMD, "$cmd |" or die "$cmd: $!"; foreach () { chomp;