From eb055de3fc09c1c1eaa529e2f5a373a70356dea3d1ede7415dbb6a495ae62e43 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 21 Sep 2011 15:25:59 +0000
Subject: [PATCH] Accepting request 83059 from home:jengelh:bl-c

- Remove redundant tags/sections from specfile
- Use %_smp_mflags for parallel build
- Fix baselibs requires for cairo-devel and make it available

OBS-URL: https://build.opensuse.org/request/show/83059
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=46
---
 baselibs.conf | 7 +++++--
 cairo.changes | 7 +++++++
 cairo.spec    | 5 +----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index f3efcc9..a174c7d 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -3,5 +3,8 @@ libcairo2
   obsoletes "cairo-<targettype> < <version>"
 libcairo-gobject2
 libcairo-script-interpreter2
-arch ppc package cairo-devel
-arch sparcv9 package cairo-devel
+cairo-devel
+  requires -cairo-<targettype>
+  requires "libcairo2-<targettype> = <version>"
+  requires "libcairo-gobject2-<targettype> = <version>"
+  requires "libcairo-script-interpreter2-<targettype> = <version>"
diff --git a/cairo.changes b/cairo.changes
index 2018174..6d10755 100644
--- a/cairo.changes
+++ b/cairo.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep 17 22:31:04 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+- Fix baselibs requires for cairo-devel and make it available
+
 -------------------------------------------------------------------
 Mon Aug 29 12:06:00 UTC 2011 - coolo@novell.com
 
diff --git a/cairo.spec b/cairo.spec
index 132f801..76698f1 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -170,7 +170,7 @@ NOCONFIGURE=1 ./autogen.sh
 %endif
     --disable-gtk-doc \
     --disable-static
-%{__make} %{?jobs:-j %jobs} V=1
+make %{?_smp_mflags} V=1
 
 %install
 %makeinstall
@@ -190,9 +190,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %postun -n libcairo-script-interpreter2 -p /sbin/ldconfig
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files -n libcairo2
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1 ChangeLog NEWS README