[mingw-pthreads] Added -static subpackage

[Erik van Pienbroek]

commit 0751587b99193ffbe329c0194647dff8773d1a27
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Jul 9 20:54:57 2012 +0200

    Added -static subpackage

 mingw-pthreads.spec |   58 +++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 11 deletions(-)
---
diff --git a/mingw-pthreads.spec b/mingw-pthreads.spec
index 3fb7307..aa64935 100644
--- a/mingw-pthreads.spec
+++ b/mingw-pthreads.spec
@@ -1,7 +1,4 @@
-%?mingw_package_header
-
-%global mingw_build_win32 1
-%global mingw_build_win64 1
+%{?mingw_package_header}
 
 # The tests take ages to run and require Wine.
 %global run_tests 0
@@ -9,7 +6,7 @@
 
 Name:           mingw-pthreads
 Version:        2.8.0
-Release:        20.%{prerelease_date}cvs%{?dist}
+Release:        21.%{prerelease_date}cvs%{?dist}
 Summary:        MinGW pthread library
 License:        LGPLv2+
 Group:          Development/Libraries
@@ -25,8 +22,8 @@ Patch0:         mingw32-pthreads-2.8.0-20110511-use-wine-for-tests.patch
 Patch1:         mingw32-pthreads-2.8.0-20110511-no-failing-tests.patch
 Patch2:         mingw32-pthreads-flags.patch
 
-BuildRequires:  mingw32-filesystem >= 82
-BuildRequires:  mingw64-filesystem >= 82
+BuildRequires:  mingw32-filesystem >= 95
+BuildRequires:  mingw64-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw64-gcc
 BuildRequires:  mingw32-gcc-c++
@@ -54,6 +51,7 @@ Win32 does not, and is unlikely to ever, support pthreads
 natively. This project seeks to provide a freely available and
 high-quality solution to this problem.
 
+# Win32
 %package -n mingw32-pthreads
 Summary:        MinGW pthread library for the win32 target
 
@@ -75,6 +73,15 @@ Win32 does not, and is unlikely to ever, support pthreads
 natively. This project seeks to provide a freely available and
 high-quality solution to this problem.
 
+%package -n mingw32-pthreads-static
+Summary:        Static version of the MinGW Windows pthreads library
+Requires:       mingw32-pthreads = %{version}-%{release}
+Group:          Development/Libraries
+
+%description -n mingw32-pthreads-static
+Static version of the MinGW Windows pthreads library.
+
+# Win64
 %package -n mingw64-pthreads
 Summary:        MinGW pthread library for the win64 target
 
@@ -96,6 +103,14 @@ Win32 does not, and is unlikely to ever, support pthreads
 natively. This project seeks to provide a freely available and
 high-quality solution to this problem.
 
+%package -n mingw64-pthreads-static
+Summary:        Static version of the MinGW Windows pthreads library
+Requires:       mingw64-pthreads = %{version}-%{release}
+Group:          Development/Libraries
+
+%description -n mingw64-pthreads-static
+Static version of the MinGW Windows pthreads library.
+
 
 %?mingw_debug_package
 
@@ -131,6 +146,10 @@ make clean
 make CROSS=%{mingw32_host}- GC-inlined
 make clean
 make CROSS=%{mingw32_host}- GCE-inlined
+mv libpthreadGC2.a libpthreadGC2.dll.a
+mv libpthreadGCE2.a libpthreadGCE2.dll.a
+make clean
+make CROSS=%{mingw32_host}- GC-static
 popd
 
 pushd build_win64
@@ -138,6 +157,10 @@ make clean
 make CROSS=%{mingw64_host}- GC-inlined
 make clean
 make CROSS=%{mingw64_host}- GCE-inlined
+mv libpthreadGC2.a libpthreadGC2.dll.a
+mv libpthreadGCE2.a libpthreadGCE2.dll.a
+make clean
+make CROSS=%{mingw64_host}- GC-static
 popd
 
 
@@ -188,7 +211,9 @@ install -m 0644 build_win64/semaphore.h $RPM_BUILD_ROOT%{mingw64_includedir}
 
 # Create a symlink from libpthreadGC2.a to libpthread.a because of BZ #498616
 ln -s libpthreadGC2.a $RPM_BUILD_ROOT%{mingw32_libdir}/libpthread.a
+ln -s libpthreadGC2.dll.a $RPM_BUILD_ROOT%{mingw32_libdir}/libpthread.dll.a
 ln -s libpthreadGC2.a $RPM_BUILD_ROOT%{mingw64_libdir}/libpthread.a
+ln -s libpthreadGC2.dll.a $RPM_BUILD_ROOT%{mingw64_libdir}/libpthread.dll.a
 
 
 %files -n mingw32-pthreads
@@ -196,23 +221,34 @@ ln -s libpthreadGC2.a $RPM_BUILD_ROOT%{mingw64_libdir}/libpthread.a
 %doc FAQ MAINTAINERS NEWS PROGRESS README README.NONPORTABLE TODO
 %{mingw32_bindir}/pthreadGC2.dll
 %{mingw32_bindir}/pthreadGCE2.dll
+%{mingw32_libdir}/libpthread.dll.a
+%{mingw32_libdir}/libpthreadGC2.dll.a
+%{mingw32_libdir}/libpthreadGCE2.dll.a
+%{mingw32_includedir}/*.h
+
+%files -n mingw32-pthreads-static
 %{mingw32_libdir}/libpthread.a
 %{mingw32_libdir}/libpthreadGC2.a
-%{mingw32_libdir}/libpthreadGCE2.a
-%{mingw32_includedir}/*.h
 
 %files -n mingw64-pthreads
 %doc ANNOUNCE BUGS ChangeLog CONTRIBUTORS COPYING COPYING.LIB
 %doc FAQ MAINTAINERS NEWS PROGRESS README README.NONPORTABLE TODO
 %{mingw64_bindir}/pthreadGC2.dll
 %{mingw64_bindir}/pthreadGCE2.dll
+%{mingw64_libdir}/libpthread.dll.a
+%{mingw64_libdir}/libpthreadGC2.dll.a
+%{mingw64_libdir}/libpthreadGCE2.dll.a
+%{mingw64_includedir}/*.h
+
+%files -n mingw64-pthreads-static
 %{mingw64_libdir}/libpthread.a
 %{mingw64_libdir}/libpthreadGC2.a
-%{mingw64_libdir}/libpthreadGCE2.a
-%{mingw64_includedir}/*.h
 
 
 %changelog
+* Mon Jul  9 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.0-21.20110511cvs
+- Added -static subpackage
+
 * Fri Mar  9 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.0-20.20110511cvs
 - Fix upgrade path when upgrading from the testing repo to F17