packages: cairo/cairo-link.patch, cairo/cairo.spec - 1.10.0 - merged from d...

[patrys]

Author: patrys                       Date: Tue Sep  7 10:45:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.10.0
- merged from devel

---- Files affected:
packages/cairo:
   cairo-link.patch (1.7 -> 1.8) , cairo.spec (1.108 -> 1.109) 

---- Diffs:

================================================================
Index: packages/cairo/cairo-link.patch
diff -u packages/cairo/cairo-link.patch:1.7 packages/cairo/cairo-link.patch:1.8
--- packages/cairo/cairo-link.patch:1.7	Tue Feb 23 08:43:08 2010
+++ packages/cairo/cairo-link.patch	Tue Sep  7 12:45:10 2010
@@ -9,12 +9,3 @@
  		       xlib_NONPKGCONFIG_CFLAGS=$X_CFLAGS
  		     fi])
  ])
-@@ -161,7 +161,7 @@
-   AC_ARG_VAR([png_REQUIRES], [module name for libpng to search for using pkg-config])
-   if test "x$png_REQUIRES" = x; then
-     # libpng13 is GnuWin32's libpng-1.2.8 :-(
--    for l in libpng12 libpng13 libpng10 libpng; do
-+    for l in libpng libpng14 libpng12 libpng13 libpng10 ; do
-       if $PKG_CONFIG --exists $l ; then
-         png_REQUIRES=$l
-         use_png=yes

================================================================
Index: packages/cairo/cairo.spec
diff -u packages/cairo/cairo.spec:1.108 packages/cairo/cairo.spec:1.109
--- packages/cairo/cairo.spec:1.108	Sat Jun  5 13:45:49 2010
+++ packages/cairo/cairo.spec	Tue Sep  7 12:45:10 2010
@@ -13,12 +13,12 @@
 Summary:	Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
-Version:	1.8.10
-Release:	2
+Version:	1.10.0
+Release:	1
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	b60a82f405f9400bbfdcf850b1728d25
+# Source0-md5:	70a2ece66cf473d976e2db0f75bf199e
 Patch0:		%{name}-link.patch
 URL:		http://cairographics.org/
 BuildRequires:	autoconf >= 2.58
@@ -167,28 +167,48 @@
 %defattr(644,root,root,755)
 # COPYING contains only notes, not LGPL/MPL texts
 %doc AUTHORS COPYING ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/cairo-trace
 %attr(755,root,root) %{_libdir}/libcairo.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libcairo.so.2
+%attr(755,root,root) %{_libdir}/libcairo-gobject.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcairo-gobject.so.2
+%attr(755,root,root) %{_libdir}/libcairo-script-interpreter.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcairo-script-interpreter.so.2
+%dir %{_libdir}/cairo
+%attr(755,root,root) %{_libdir}/cairo/libcairo-trace.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/cairo/libcairo-trace.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcairo.so
+%attr(755,root,root) %{_libdir}/libcairo-gobject.so
+%attr(755,root,root) %{_libdir}/libcairo-script-interpreter.so
+%attr(755,root,root) %{_libdir}/cairo/libcairo-trace.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/cairo/libcairo-trace.so.0
+%attr(755,root,root) %{_libdir}/cairo/libcairo-trace.so
 %{_libdir}/libcairo.la
+%{_libdir}/libcairo-script-interpreter.la
 %{_includedir}/cairo
 %{_pkgconfigdir}/cairo.pc
 %{?with_glitz:%{_pkgconfigdir}/cairo-glitz.pc}
+%{_pkgconfigdir}/cairo-fc.pc
 %{_pkgconfigdir}/cairo-ft.pc
+%{_pkgconfigdir}/cairo-gobject.pc
 %{_pkgconfigdir}/cairo-pdf.pc
 %{_pkgconfigdir}/cairo-png.pc
 %{_pkgconfigdir}/cairo-ps.pc
 %{_pkgconfigdir}/cairo-svg.pc
 %{?with_xcb:%{_pkgconfigdir}/cairo-xcb.pc}
+%{?with_xcb:%{_pkgconfigdir}/cairo-xcb-shm.pc}
 %{_pkgconfigdir}/cairo-xlib.pc
 %{_pkgconfigdir}/cairo-xlib-xrender.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libcairo.a
+%{_libdir}/libcairo-gobject.a
+%{_libdir}/libcairo-gobject.la
+%{_libdir}/libcairo-script-interpreter.a
 
 %if %{with apidocs}
 %files apidocs
@@ -202,6 +222,25 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2010/09/07 10:45:10  patrys
+- 1.10.0
+- merged from devel
+
+Revision 1.108.2.5  2010/09/07 10:42:33  patrys
+- 1.10.0
+
+Revision 1.108.2.4  2010/08/31 14:26:24  patrys
+- 1.9.14
+
+Revision 1.108.2.3  2010/07/22 21:05:47  patrys
+- and package them in the right place
+
+Revision 1.108.2.2  2010/07/22 21:02:57  patrys
+- for now package the libtool files (too many packages to rebuild them this evening)
+
+Revision 1.108.2.1  2010/07/22 20:49:18  patrys
+- 0.9.12
+
 Revision 1.108  2010/06/05 11:45:49  arvenil
 - added missing *.pc for build with glitz
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cairo/cairo-link.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cairo/cairo.spec?r1=1.108&r2=1.109&f=u