X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=binutils%2Fmingw-binutils.spec;h=27d58d2f7cd2dab1e4fee5013c9a0be9804a38a2;hb=867e3216a67af076107dc2eee37f384db1638544;hp=639b606920f343d6744273c16740ec6569a7f880;hpb=f81a49fa1976471ead28f7e0d656ca9d2188d755;p=fedora-mingw.git

diff --git a/binutils/mingw-binutils.spec b/binutils/mingw-binutils.spec
index 639b606..27d58d2 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:        7%{?dist}
 Summary:        MinGW Windows binutils
 
 License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
@@ -16,6 +16,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  flex
 BuildRequires:  bison
 BuildRequires:  texinfo
+BuildRequires:  mingw-filesystem >= 2
+
+Requires:       mingw-filesystem >= 2
 
 
 %description
@@ -33,12 +36,12 @@ cd build
 CFLAGS="$RPM_OPT_FLAGS" \
 ../configure \
   --build=%_build --host=%_host \
-  --target=i686-pc-mingw32 \
+  --target=%{_mingw_target} \
   --verbose --disable-nls \
   --without-included-gettext \
   --disable-win32-registry \
   --disable-werror \
-  --with-sysroot=%{_prefix}/i686-pc-mingw32/sys-root \
+  --with-sysroot=%{_mingw_sysroot} \
   --prefix=%{_prefix} --bindir=%{_bindir} \
   --includedir=%{_includedir} --libdir=%{_libdir} \
   --mandir=%{_mandir} --infodir=%{_infodir}
@@ -56,11 +59,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 +68,13 @@ 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
+* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-7
+- Use mingw-filesystem.
+
+* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-5
 - Initial RPM release, largely based on earlier work from several sources.