From 7ca04f024c5d590c47b83433640a8640ab481ca54b24b13e8303d173b53d99d2 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sun, 4 Feb 2007 17:20:20 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/cairo?expand=0&rev=4

---
 cairo.changes |  6 ++++++
 cairo.spec    | 35 ++++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/cairo.changes b/cairo.changes
index 63b201a..af2e838 100644
--- a/cairo.changes
+++ b/cairo.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  2 16:47:27 CET 2007 - sbrabec@suse.cz
+
+- Removed references to /opt/gnome.
+- Fixed devel dependencies.
+
 -------------------------------------------------------------------
 Fri Jan 26 19:12:23 CET 2007 - jhargadon@suse.de
 
diff --git a/cairo.spec b/cairo.spec
index 201539c..13402cd 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -12,19 +12,22 @@
 
 Name:           cairo
 BuildRequires:  freetype2-devel glitz-devel libpng-devel
+# FIXME: Only for directory ownership:
+BuildRequires:  gtk-doc
 License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL), MOZILLA PUBLIC LICENSE (MPL/NPL)
 Group:          Development/Libraries/X11
 Summary:        Vector Graphics Library with Cross-Device Output Support
 URL:            http://cairographics.org/
 Version:        1.2.4
-Release:        19
-Source0:        %name-%version.tar.bz2
+Release:        20
+Source:         %{name}-%{version}.tar.bz2
 Patch2:         cairo-remove-requires-private.patch
 Patch3:         cairo-defines.patch
 Patch4:         cairo-1.0.2-depth-fix-1.patch
 Patch6:         bugzilla-104365.patch
 Patch7:         cairo-1.2.4-lcd-filter-1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# Last present in SuSE Linux 10.0 (and NLD9):
 Obsoletes:      libpixman
 
 %description
@@ -44,9 +47,10 @@ Authors:
 Summary:        Development environment for cairo
 Group:          Development/Libraries/X11
 Requires:       %{name} = %{version} freetype2-devel fontconfig-devel xorg-x11-devel libpng-devel glitz-devel
-%if %(rpm -q --queryformat=%{version} xorg-x11-devel | sed 's/\..*$//') >= 7
-Requires:       xorg-x11-libXrender-devel
+%if %(rpm -q --queryformat=%%{version} xorg-x11-devel | sed 's/\..*$//') >= 7
+Requires:       xorg-x11-libXrender-devel xorg-x11-libX11-devel
 %endif
+# Last present in SuSE Linux 10.0 (and NLD9):
 Obsoletes:      libpixman-devel
 
 %description devel
@@ -83,15 +87,11 @@ Authors:
 %patch7 -p1
 
 %build
-autoconf
+autoreconf -f -i
 %if %suse_version > 1000
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector"
+export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
 %endif
-export CFLAGS="$RPM_OPT_FLAGS"
-./configure\
-	--prefix=/usr\
-	--libdir=%{_libdir}\
-	--mandir=%{_mandir}\
+%configure\
 	--enable-glitz\
 	--enable-ps\
 	--enable-pdf\
@@ -99,9 +99,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
 make %{?jobs:-j %jobs}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/opt/gnome
-mv $RPM_BUILD_ROOT/usr/share $RPM_BUILD_ROOT/opt/gnome
+%makeinstall
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -113,16 +111,19 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files devel
 %defattr(-, root, root)
-/usr/include/cairo
-%{_libdir}/libcairo.*a
+%{_includedir}/cairo
 %{_libdir}/libcairo.so
+%{_libdir}/libcairo.*a
 %{_libdir}/pkgconfig/*.pc
 
 %files doc
 %defattr(-, root, root)
-/opt/gnome/share/gtk-doc/html/*
+%{_datadir}/gtk-doc/html/*
 
 %changelog -n cairo
+* Fri Feb 02 2007 - sbrabec@suse.cz
+- Removed references to /opt/gnome.
+- Fixed devel dependencies.
 * Fri Jan 26 2007 - jhargadon@suse.de
 - removed patch cairo-remove-requires-private.patch (#237155)
 * Tue Jan 23 2007 - ro@suse.de