X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=cairo.spec;h=c26cf22c998ac54715aa2b140d89c4aa35be6141;hb=eca05c24be87e5f38e0917a82e4d5a63dcd8b0b3;hp=1010be72c22ebcb62422d66eb723498d1f8629b4;hpb=476e1139d7e258e8b2e2e20f1c9891350be77525;p=packages%2Fcairo.git

diff --git a/cairo.spec b/cairo.spec
index 1010be7..c26cf22 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -17,20 +17,21 @@
 %bcond_without	xcb		# XCB backend
 %endif
 %bcond_with	tests		# perform tests (can fail due to out of memory)
-#
+
 %if %{with glesv2}
 %undefine	with_gl
 %endif
 Summary:	Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
-Version:	1.12.16
-Release:	3
+Version:	1.14.0
+Release:	2
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 Source0:	http://cairographics.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5:	a1304edcdc99282f478b995ee5f8f854
+# Source0-md5:	fc3a5edeba703f906f2241b394f0cced
 Patch0:		%{name}-link.patch
+Patch1:		%{name}-gobject-deps.patch
 URL:		http://cairographics.org/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
 %if %{with gl} || %{with glesv2} || %{with openvg}
@@ -49,20 +50,21 @@ BuildRequires:	binutils-devel
 %{?with_cogl:BuildRequires:	cogl-devel}
 BuildRequires:	fontconfig-devel >= 2.2.95
 BuildRequires:	freetype-devel >= 1:2.3.0
-BuildRequires:	glib2-devel >= 1:2.0
+BuildRequires:	glib2-devel >= 1:2.14
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.15}
 %{?with_drm:BuildRequires:	libdrm-devel}
 BuildRequires:	libpng-devel >= 2:1.4.0
 %if %{with svg} && %{with tests}
-BuildRequires:	librsvg-devel >= 2.15.0
+BuildRequires:	librsvg-devel >= 2.35.0
 %endif
 %if %{with ps} && %{with tests}
 BuildRequires:	libspectre-devel >= 0.2.0
 %endif
 BuildRequires:	libtool >= 2:2.2
 %{?with_xcb:BuildRequires:	libxcb-devel >= 1.6}
-BuildRequires:	pixman-devel >= 0.22.0
-BuildRequires:	pkgconfig >= 1:0.9
+BuildRequires:	lzo-devel >= 2
+BuildRequires:	pixman-devel >= 0.30.0
+BuildRequires:	pkgconfig >= 1:0.18
 %if %{with pdf} && %{with tests}
 BuildRequires:	poppler-glib-devel >= 0.17.4
 %endif
@@ -83,7 +85,7 @@ BuildRequires:	zlib-devel
 Requires:	fontconfig-libs >= 2.2.95
 Requires:	freetype >= 1:2.3.0
 %{?with_xcb:Requires:	libxcb >= 1.6}
-Requires:	pixman >= 0.22.0
+Requires:	pixman >= 0.30.0
 %{?with_drm:Requires:	udev-libs >= 1:136}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -134,7 +136,8 @@ Requires:	freetype-devel >= 1:2.3.0
 %{?with_drm:Requires:	libdrm-devel}
 Requires:	libpng-devel >= 2:1.4.0
 %{?with_xcb:Requires:	libxcb-devel >= 1.6}
-Requires:	pixman-devel >= 0.22.0
+Requires:	lzo-devel >= 2
+Requires:	pixman-devel >= 0.30.0
 %{?with_drm:Requires:	udev-devel >= 1:136}
 %if "%{pld_release}" == "ac"
 Requires:	xrender-devel >= 0.6
@@ -168,6 +171,7 @@ Summary:	GObject functions library for Cairo graphics library
 Summary(pl.UTF-8):	Biblioteka funkcji GObject dla biblioteki graficznej Cairo
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	glib2 >= 1:2.14
 
 %description gobject
 GObject functions library for Cairo graphics library.
@@ -181,7 +185,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Cairo GObject
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-gobject = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.0
+Requires:	glib2-devel >= 1:2.14
 
 %description gobject-devel
 Header files for Cairo GObject library.
@@ -219,6 +223,9 @@ Summary:	Cairo API documentation
 Summary(pl.UTF-8):	Dokumentacja API Cairo
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 Cairo API documentation.
@@ -229,6 +236,7 @@ Dokumentacja API Cairo.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -256,8 +264,6 @@ Dokumentacja API Cairo.
 	--enable-xml \
 	--with-html-dir=%{_gtkdocdir}
 
-%{__sed} -i 's/gobject-2.0 glib-2.0//' src/cairo.pc
-
 %{__make}
 %{?with_tests:%{__make} check}