From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Wed, 19 Nov 2008 18:08:27 +0000 (+0000)
Subject: - Rebuild against mingw32-filesystem 37
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=90047720745ade99c0794bf9e4ebb2cc726a16c8;p=fedora-mingw.git

- Rebuild against mingw32-filesystem 37

- Remove the useconds patch, which is no longer needed (Levente Farkas).
- Use _mingw32_configure macro.
---

diff --git a/runtime/mingw32-runtime-3.15.1-useconds_t.patch b/runtime/mingw32-runtime-3.15.1-useconds_t.patch
deleted file mode 100644
index 1d46f03..0000000
--- a/runtime/mingw32-runtime-3.15.1-useconds_t.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mingwrt-3.15.1-mingw32/mingwex/usleep.c	2008-05-04 13:15:41.000000000 +0100
-+++ mingwrt-3.15.1-mingw32.usleep/mingwex/usleep.c	2008-10-16 17:58:36.000000000 +0100
-@@ -26,6 +26,11 @@
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
- 
-+/* RWMJ: This is defined in our local sys/types.h but for some reason
-+ * isn't picked up.
-+ */
-+typedef unsigned int useconds_t;
-+
- int __cdecl usleep(useconds_t useconds)
- {
-     if(useconds == 0)
diff --git a/runtime/mingw32-runtime.spec b/runtime/mingw32-runtime.spec
index 016e857..1dcb5b3 100644
--- a/runtime/mingw32-runtime.spec
+++ b/runtime/mingw32-runtime.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-runtime
 Version:        3.15.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows cross-compiler runtime and root filesystem
 
 License:        Public Domain
@@ -15,7 +15,7 @@ URL:            http://www.mingw.org/
 Source0:        http://dl.sourceforge.net/sourceforge/mingw/mingwrt-%{version}-mingw32-src.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         mingw32-runtime-3.15.1-useconds_t.patch
+#Patch0:         mingw32-runtime-3.15.1-useconds_t.patch
 
 BuildArch:      noarch
 
@@ -46,11 +46,7 @@ MinGW Windows cross-compiler runtime, base libraries.
 
 
 %build
-CFLAGS="-I%{_mingw32_includedir}" \
-./configure \
-  --build=%_build \
-  --host=%{_mingw32_host}
-
+%{_mingw32_configure}
 make
 
 
@@ -80,6 +76,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 3.15.1-4
+- Rebuild against mingw32-filesystem 37
+
+* Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 3.15.1-3
+- Remove the useconds patch, which is no longer needed (Levente Farkas).
+- Use _mingw32_configure macro.
+
 * Wed Nov 19 2008 Richard W.M. Jones <rjones@redhat.com> - 3.15.1-2
 - Rebuild against mingw32-filesystem 36