rpms/mingw32-cairo/devel mingw32-cairo.spec,1.5,1.6

Erik van Pienbroek epienbro at fedoraproject.org
Tue Apr 14 19:26:00 UTC 2009


Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-cairo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23802

Modified Files:
	mingw32-cairo.spec 
Log Message:
- Fixed %defattr line
- Added -static subpackage
- Use ./configure --disable-pthread to avoid conflict with native pthread library



Index: mingw32-cairo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-cairo/devel/mingw32-cairo.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mingw32-cairo.spec	10 Mar 2009 13:47:38 -0000	1.5
+++ mingw32-cairo.spec	14 Apr 2009 19:25:29 -0000	1.6
@@ -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 @@
 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 @@
   --disable-xcb \
   --enable-win32 \
   --enable-png \
-  --disable-static \
+  --enable-static \
+  --disable-pthread \
   --disable-ft
 make %{?_smp_mflags}
 
@@ -69,7 +79,7 @@
 
 
 %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 @@
 %{_mingw32_libdir}/pkgconfig/cairo.pc
 
 
+%files static
+%defattr(-,root,root,-)
+%{_mingw32_libdir}/libcairo.a
+
+
 %changelog
+* Fri Apr  3 2009 Erik van Pienbroek <epienbro at 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 at redhat.com> - 1.8.6-1
 - Rebase to 1.8.6, same as Fedora native version.
 - Source URL corrected.




More information about the fedora-extras-commits mailing list