From fdff309117227eb311f27c9d2220e943fd60c0ce Mon Sep 17 00:00:00 2001
From: epienbro <epienbro@fedoraproject.org>
Date: Tue, 14 Apr 2009 19:25:29 +0000
Subject: [PATCH] - Fixed %defattr line - Added -static subpackage - Use
 ./configure --disable-pthread to avoid conflict with native pthread    
 library

---
 mingw32-cairo.spec | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/mingw32-cairo.spec b/mingw32-cairo.spec
index 83fe19c..7874a85 100644
--- a/mingw32-cairo.spec
+++ b/mingw32-cairo.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-cairo
 Version:        1.8.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MinGW Windows Cairo library
 
 License:        LGPLv2 or MPLv1.1
@@ -41,6 +41,15 @@ Requires:       pkgconfig
 MinGW Windows Cairo library.
 
 
+%package static
+Summary:        Static version of the MinGW Windows Cairo library
+Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+
+%description static
+Static version of the MinGW Windows Cairo library.
+
+
 %prep
 %setup -q -n cairo-%{version}
 
@@ -51,7 +60,8 @@ MinGW Windows Cairo library.
   --disable-xcb \
   --enable-win32 \
   --enable-png \
-  --disable-static \
+  --enable-static \
+  --disable-pthread \
   --disable-ft
 make %{?_smp_mflags}
 
@@ -69,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
 %{_mingw32_bindir}/libcairo-2.dll
 %{_mingw32_includedir}/cairo/
@@ -84,7 +94,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/pkgconfig/cairo.pc
 
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libcairo.a
+
+
 %changelog
+* Fri Apr  3 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.8.6-2
+- Fixed %%defattr line
+- Added -static subpackage
+- Use ./configure --disable-pthread to avoid conflict with native pthread library
+
 * Tue Mar 10 2009 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-1
 - Rebase to 1.8.6, same as Fedora native version.
 - Source URL corrected.