From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Mon, 7 Jul 2008 19:45:16 +0000 (+0100)
Subject: "Second copy" of binutils actually needed.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=60aa11e32b8635dbeae99afcd24e0ad6405f4ab8;p=fedora-mingw.git

"Second copy" of binutils actually needed.
---

diff --git a/binutils/mingw-binutils.spec b/binutils/mingw-binutils.spec
index 639b606..58691e5 100644
--- a/binutils/mingw-binutils.spec
+++ b/binutils/mingw-binutils.spec
@@ -4,7 +4,7 @@
 
 Name:           mingw-binutils
 Version:        %{binutils_version}_%{mingw_binutils_rpmvers}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows binutils
 
 License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
@@ -56,11 +56,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_infodir}
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
-# Install puts a second copy of all the executables under the MinGW
-# root (/usr/i686-pc-mingw/bin/*).  I'm not sure why it does this,
-# but it doesn't seem to be necessary.
-rm -rf $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/bin
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,9 +65,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_mandir}/man1/*
 %{_bindir}/i686-pc-mingw32-*
+%{_prefix}/i686-pc-mingw32/bin/*
 %{_prefix}/i686-pc-mingw32/lib/ldscripts
 
 
 %changelog
-* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-2
+* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-3
 - Initial RPM release, largely based on earlier work from several sources.