- release 6

[packages/cairo.git] / cairo.spec

diff --git a/cairo.spec b/cairo.spec
index 3fb22941ed5e3ca98deeb357580a72d51d2682c6..63c6270ff417c8fb2c9ae243cee20df2bddbe41c 100644 (file)
--- a/cairo.spec
+++ b/cairo.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
 %bcond_without apidocs         # disable gtk-doc
+%bcond_without svg             # disable SVG support (to boostrap librsvg)
 %if "%{pld_release}" == "ac"
 %bcond_with    xcb             # XCB backend
 %else
@@ -11,14 +12,13 @@
 Summary:       Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8):     Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:          cairo
-Version:       1.10.0
-Release:       4
+Version:       1.10.2
+Release:       6
 License:       LGPL v2.1 or MPL v1.1
 Group:         Libraries
 Source0:       http://cairographics.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 70a2ece66cf473d976e2db0f75bf199e
+# Source0-md5: f101a9e88b783337b20b2e26dfd26d5f
 Patch0:                %{name}-link.patch
-Patch1:                %{name}-comma.patch
 URL:           http://cairographics.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9.6
@@ -27,13 +27,14 @@ BuildRequires:      freetype-devel >= 1:2.3.0
 BuildRequires: glib2-devel >= 1:2.0
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.6}
 BuildRequires: libpng-devel >= 2:1.4.0
-BuildRequires: librsvg-devel >= 2.15.0
+%{?with_svg:BuildRequires:     librsvg-devel >= 2.15.0}
 BuildRequires: libspectre-devel >= 0.2.0
 BuildRequires: libtool >= 1.4
 BuildRequires: pixman-devel >= 0.18.4
 BuildRequires: pkgconfig >= 1:0.9
-BuildRequires: poppler-glib-devel >= 0.13.3
+%{?with_tests:BuildRequires:   poppler-glib-devel >= 0.13.3}
 BuildRequires: rpm >= 4.4.9-56
+BuildRequires: sed >= 4.0
 %if %{with xcb}
 BuildRequires: libxcb-devel >= 1.4
 %endif
@@ -176,7 +177,6 @@ Dokumentacja API Cairo.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -192,8 +192,13 @@ Dokumentacja API Cairo.
        --enable-pdf \
        --enable-png \
        --enable-ps \
+       %{!?with_svg:--disable-svg} \
+       --enable-tee \
        %{?with_xcb:--enable-xcb} \
        --with-html-dir=%{_gtkdocdir}
+
+%{__sed} -i 's/gobject-2.0 glib-2.0//' src/cairo.pc
+
 %{__make}
 %{?with_tests:%{__make} check}
 
@@ -240,7 +245,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/cairo-pdf.pc
 %{_pkgconfigdir}/cairo-png.pc
 %{_pkgconfigdir}/cairo-ps.pc
-%{_pkgconfigdir}/cairo-svg.pc
+%{?with_svg:%{_pkgconfigdir}/cairo-svg.pc}
+%{_pkgconfigdir}/cairo-tee.pc
 %{?with_xcb:%{_pkgconfigdir}/cairo-xcb.pc}
 %{?with_xcb:%{_pkgconfigdir}/cairo-xcb-shm.pc}
 %{_pkgconfigdir}/cairo-xlib.pc