- TODO removed, not a bug.

[packages/cairo.git] / cairo.spec

diff --git a/cairo.spec b/cairo.spec
index 6a4c9067f3e1eeb896f1fdb267dca0b65a186aaf..3fa2230e9dcee30318fca6433396557906e2620c 100644 (file)
--- a/cairo.spec
+++ b/cairo.spec
@@ -1,30 +1,33 @@
 #
 # Conditional build:
-%bcond_with    xcb     # enable XCB backend (XCB not released yet)
+%bcond_without apidocs         # disable gtk-doc
+%bcond_with    xcb             # enable XCB backend (XCB not released yet)
+%bcond_with    tests           # perform tests (can fail due to out of memory)
 #
 Summary:       Cairo - multi-platform 2D graphics library
 Summary(pl):   Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:          cairo
 Version:       1.0.2
-Release:       1
+Release:       3
 License:       LGPL v2.1 or MPL v1.1
 Group:         Libraries
 Source0:       http://cairographics.org/releases/%{name}-%{version}.tar.gz
 # Source0-md5: d0b7111a14f90ec3afa777ec40c44984
+Patch0:                %{name}-gcc4.patch
 URL:           http://cairographics.org/
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake >= 1.7
 BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel >= 2.1.4
+BuildRequires: freetype-devel >= 2.1.10
 BuildRequires: glitz-devel >= 0.4.4
-BuildRequires: gtk-doc >= 1.3
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.3}
 BuildRequires: libpng-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
 %{?with_xcb:BuildRequires:     xcb-devel}
 BuildRequires: xrender-devel >= 0.6
 BuildRequires: zlib-devel
-Requires:      freetype >= 2.1.4
+Requires:      freetype >= 2.1.10
 Requires:      glitz >= 0.4.4
 Requires:      xrender >= 0.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -75,7 +78,7 @@ Summary(pl):  Pliki programistyczne biblioteki Cairo
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      fontconfig-devel
-Requires:      freetype-devel >= 2.1.4
+Requires:      freetype-devel >= 2.1.10
 Requires:      glitz-devel >= 0.4.4
 Requires:      libpng-devel
 %{?with_xcb:Requires:  xcb-devel}
@@ -101,6 +104,7 @@ Statyczna biblioteka Cairo.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -109,13 +113,14 @@ Statyczna biblioteka Cairo.
 %{__autoconf}
 %{__automake}
 %configure \
-       --enable-gtk-doc \
+       %{?with_apidocs:--enable-gtk-doc} \
        %{?with_xcb:--enable-xcb} \
        --enable-glitz \
        --enable-ps \
        --enable-pdf \
        --with-html-dir=%{_gtkdocdir}
 %{__make}
+%{?with_tests:%{__make} check}
 
 %install
 rm -rf $RPM_BUILD_ROOT