%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: 1%{?dist}
+Release: 4%{?dist}
Summary: MinGW pthread library
+%define crazy_version %(echo %{version}|tr . -)
+
License: LGPLv2+
Group: Development/Libraries
URL: http://sourceware.org/pthreads-win32/
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
%if %{run_tests}
%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
%files
%defattr(-,root,root)
+%doc ANNOUNCE BUGS ChangeLog CONTRIBUTORS COPYING COPYING.LIB
+%doc FAQ MAINTAINERS NEWS PROGRESS README README.NONPORTABLE TODO
%{_mingw32_bindir}/pthreadGC2.dll
%{_mingw32_bindir}/pthreadGCE2.dll
%{_mingw32_bindir}/pthread.def
%{_mingw32_libdir}/libpthreadGC2.a
%{_mingw32_libdir}/libpthreadGCE2.a
%{_mingw32_includedir}/pthread
-%doc ANNOUNCE BUGS ChangeLog CONTRIBUTORS COPYING COPYING.LIB
-%doc FAQ MAINTAINERS NEWS PROGRESS README README.NONPORTABLE TODO
%changelog
-* Fri Oct 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.8.0-1
+* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 2.8.0-4
+- Cleanup to the spec file, no functional changes.
+
+* 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.