From 6e35c5dd02762948fffd81eed1b42baaa8902524 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] minor cleanup (Levente Farkas)

---
 pthreads/mingw32-pthreads-flags.patch | 13 +++++++++++++
 pthreads/mingw32-pthreads.spec        | 28 +++++++++++++++++-----------
 2 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 pthreads/mingw32-pthreads-flags.patch

diff --git a/pthreads/mingw32-pthreads-flags.patch b/pthreads/mingw32-pthreads-flags.patch
new file mode 100644
index 0000000..6da6beb
--- /dev/null
+++ b/pthreads/mingw32-pthreads-flags.patch
@@ -0,0 +1,13 @@
+--- ./GNUmakefile.lfarkas	2008-12-29 16:23:03.000000000 +0100
++++ ./GNUmakefile	2008-12-29 16:23:45.000000000 +0100
+@@ -58,8 +58,8 @@
+ RANLIB  = $(CROSS)ranlib
+ RC	= $(CROSS)windres
+ 
+-OPT	= $(CLEANUP) -O3 -finline-functions
+-DOPT	= $(CLEANUP) -g -O0
++OPT	= $(CLEANUP) -O3 -finline-functions -mms-bitfields
++DOPT	= $(CLEANUP) -g -O0 -mms-bitfields
+ XOPT	=
+ 
+ RCFLAGS		= --include-dir=.
diff --git a/pthreads/mingw32-pthreads.spec b/pthreads/mingw32-pthreads.spec
index cf09b95..65037f2 100644
--- a/pthreads/mingw32-pthreads.spec
+++ b/pthreads/mingw32-pthreads.spec
@@ -4,16 +4,16 @@
 %define __find_requires %{_mingw32_findrequires}
 %define __find_provides %{_mingw32_findprovides}
 
-%define crazy_version 2-8-0
-
 # The tests take ages to run and require Wine.
 %define run_tests 0
 
 Name:           mingw32-pthreads
 Version:        2.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW pthread library
 
+%define crazy_version %(echo %{version}|tr . -)
+
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://sourceware.org/pthreads-win32/
@@ -24,8 +24,9 @@ BuildArch:      noarch
 
 Patch0:         mingw32-pthreads-2.8.0-use-wine-for-tests.patch
 Patch1:         mingw32-pthreads-2.8.0-no-failing-tests.patch
+Patch2:		mingw32-pthreads-flags.patch
 
-BuildRequires:  mingw32-filesystem >= 30
+BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
@@ -55,21 +56,23 @@ high-quality solution to this problem.
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
-make clean
-make CROSS=%{_mingw32_host}- GC-inlined
-make CROSS=%{_mingw32_host}- GCE-inlined
+%{_mingw32_make} clean
+%{_mingw32_make} CROSS=%{_mingw32_host}- GC-inlined
+%{_mingw32_make} clean
+%{_mingw32_make} CROSS=%{_mingw32_host}- GCE-inlined
 
 
 %check
 %if %{run_tests}
 pushd tests
-make clean
-make QAPC= CC=i686-pc-mingw32-gcc XXCFLAGS="-D__CLEANUP_C" TEST=GC all-pass
-make clean
-make QAPC= CC=i686-pc-mingw32-gcc XXCFLAGS="-D__CLEANUP_C" TEST=GCE all-pass
+%{_mingw32_make} clean
+%{_mingw32_make} QAPC= CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GC all-pass
+%{_mingw32_make} clean
+%{_mingw32_make} QAPC= CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GCE all-pass
 popd
 %endif
 
@@ -104,5 +107,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 29 2008 Levente Farkas <lfarkas@lfarkas.org> - 2.8.0-3
+- minor cleanup
+
 * Fri Oct 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.8.0-2
 - Initial RPM release.
-- 
1.8.3.1