From 27296af8e99dbe115b7ddf1db711bd488891a965 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 1 Jan 1970 00:00:00 +0000
Subject: [PATCH] Add _mingw_target and _mingw_sysroot macros

---
 binutils/mingw-binutils.spec     | 16 ++++++++--------
 filesystem/mingw-filesystem.spec |  6 +++++-
 filesystem/mingw-macros.mingw    |  7 ++++++-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/binutils/mingw-binutils.spec b/binutils/mingw-binutils.spec
index b8b2f2b..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:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW Windows binutils
 
 License:        GPLv2+ and LGPLv2+ and GPLv3+ and LGPLv3+
@@ -16,9 +16,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  flex
 BuildRequires:  bison
 BuildRequires:  texinfo
-BuildRequires:  mingw-filesystem
+BuildRequires:  mingw-filesystem >= 2
 
-Requires:       mingw-filesystem
+Requires:       mingw-filesystem >= 2
 
 
 %description
@@ -36,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}
@@ -68,12 +68,12 @@ 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/*
+%{_prefix}/i686-pc-mingw32/bin
+%{_prefix}/i686-pc-mingw32/lib/ldscripts
 
 
 %changelog
-* Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-6
+* 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
diff --git a/filesystem/mingw-filesystem.spec b/filesystem/mingw-filesystem.spec
index 3e438ee..c91e5a9 100644
--- a/filesystem/mingw-filesystem.spec
+++ b/filesystem/mingw-filesystem.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw-filesystem
-Version:        1
+Version:        2
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -91,5 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 2-1
+- Add _mingw_sysroot macro.
+- Add _mingw_target macro.
+
 * Mon Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 1-1
 - Basic filesystem layout.
diff --git a/filesystem/mingw-macros.mingw b/filesystem/mingw-macros.mingw
index f1e8fab..58c133e 100644
--- a/filesystem/mingw-macros.mingw
+++ b/filesystem/mingw-macros.mingw
@@ -1,6 +1,8 @@
 # RPM macros for Fedora MinGW.
 
-%_mingw_prefix            %{_prefix}/i686-pc-mingw32/sys-root/mingw
+# Paths.
+%_mingw_sysroot           %{_prefix}/i686-pc-mingw32/sys-root
+%_mingw_prefix            %{_mingw_sysroot}/mingw
 %_mingw_bindir            %{_mingw_prefix}/bin
 %_mingw_sbindir           %{_mingw_prefix}/sbin
 %_mingw_libdir            %{_mingw_prefix}/lib
@@ -10,3 +12,6 @@
 %_mingw_mandir            %{_mingw_prefix}/share/man
 %_mingw_sysconfdir        %{_mingw_prefix}/etc
 %_mingw_includedir        %{_mingw_prefix}/include
+
+# Build macros.
+%_mingw_target            i686-pc-mingw32
-- 
1.8.3.1