rpms/mingw32-pthreads/F-10 mingw32-pthreads.spec,1.1,1.2

[Erik van Pienbroek]

Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-pthreads/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26953

Modified Files:
	mingw32-pthreads.spec 
Log Message:
Merged the changes from the devel/F-11 branch with the F-10 branch:
* Fri May 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.0-8
- Create a symlink from libpthreadGC2.a to libpthread.a because of BZ #498616

* Fri Mar 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.8.0-7
- Move header files to system include directory.



Index: mingw32-pthreads.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-pthreads/F-10/mingw32-pthreads.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-pthreads.spec	14 Jan 2009 09:50:55 -0000	1.1
+++ mingw32-pthreads.spec	27 May 2009 09:10:51 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:           mingw32-pthreads
 Version:        2.8.0
-Release:        4%{?dist}
+Release:        8%{?dist}
 Summary:        MinGW pthread library
 
 %define crazy_version %(echo %{version}|tr . -)
@@ -26,7 +26,7 @@ Patch0:         mingw32-pthreads-2.8.0-u
 Patch1:         mingw32-pthreads-2.8.0-no-failing-tests.patch
 Patch2:		mingw32-pthreads-flags.patch
 
-BuildRequires:  mingw32-filesystem >= 40
+BuildRequires:  mingw32-filesystem >= 49
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
@@ -84,12 +84,15 @@ rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}/pthread
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}
 
 install -m 0755 *.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
 install -m 0644 *.def $RPM_BUILD_ROOT%{_mingw32_bindir}
 install -m 0644 *.a $RPM_BUILD_ROOT%{_mingw32_libdir}
-install -m 0644 *.h $RPM_BUILD_ROOT%{_mingw32_includedir}/pthread
+install -m 0644 *.h $RPM_BUILD_ROOT%{_mingw32_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
 
 
 %clean
@@ -103,12 +106,25 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_bindir}/pthreadGC2.dll
 %{_mingw32_bindir}/pthreadGCE2.dll
 %{_mingw32_bindir}/pthread.def
+%{_mingw32_libdir}/libpthread.a
 %{_mingw32_libdir}/libpthreadGC2.a
 %{_mingw32_libdir}/libpthreadGCE2.a
-%{_mingw32_includedir}/pthread
+%{_mingw32_includedir}/*.h
 
 
 %changelog
+* Fri May 22 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.8.0-8
+- Create a symlink from libpthreadGC2.a to libpthread.a because of BZ #498616
+
+* Fri Mar 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.8.0-7
+- Move header files to system include directory.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 2.8.0-5
+- Rebuild for mingw32-gcc 4.4
+
 * Tue Jan 13 2009 Richard W.M. Jones <rjones at redhat.com> - 2.8.0-4
 - Cleanup to the spec file, no functional changes.