From 1d0e3a06c087d4b39a4c3c08c1388a680cc488895f5ef3e5f01e2c13731fb3b0 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 16 Dec 2009 08:22:00 +0000
Subject: [PATCH] Accepting request 26727 from X11:XOrg

Copy from X11:XOrg/Mesa based on submit request 26727 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/26727
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=77
---
 Mesa.changes |  7 +++++++
 Mesa.spec    | 13 +++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Mesa.changes b/Mesa.changes
index 56c90ef..c564d1f 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec 15 21:21:51 CET 2009 - jengelh@medozas.de
+
+- add baselibs.conf as a source
+- enable parallel building
+- build drivers for SPARC
+
 -------------------------------------------------------------------
 Tue Dec  8 03:53:06 CET 2009 - sndirsch@suse.de
 
diff --git a/Mesa.spec b/Mesa.spec
index e7769c6..ead95ba 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -33,10 +33,11 @@ Obsoletes:      Mesa-64bit
 %endif
 #
 Version:        7.7
-Release:        2
+Release:        3
 Summary:        Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL
 Source:         MesaLib-%{version}-rc2.tar.bz2
 Source1:        MesaDemos-%{version}-rc2.tar.bz2
+Source2:        baselibs.conf
 Source3:        README.updates
 Source4:        manual-pages.tar.bz2
 Source5:        drirc
@@ -130,7 +131,7 @@ autoreconf -fi
            --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,sis,tdfx,unichrome,ffb,swrast \
            --enable-gallium-nouveau \
 %endif
-%ifarch ppc
+%ifarch ppc %sparc
            --with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,r600,radeon,tdfx,unichrome,ffb,swrast \
 %endif
 %ifarch s390 s390x
@@ -141,8 +142,8 @@ autoreconf -fi
 %endif
            --disable-glut \
 	   CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
-make -C src/gallium/state_trackers/dri
-gmake
+make %{?jobs:-j%jobs} -C src/gallium/state_trackers/dri
+gmake %{?jobs:-j%jobs};
 make install DESTDIR=$RPM_BUILD_ROOT
 # build and install Indirect Rendering only libGL
 make realclean
@@ -153,13 +154,13 @@ make realclean
            --disable-gallium \
 	   CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
 sed -i 's/GL_LIB = .*/GL_LIB = IndirectGL/g' configs/autoconf
-gmake 
+gmake %{?jobs:-j%jobs};
 cp -a %{_lib}/libIndirectGL.so.* %{_lib}/libOSMesa.so* \
   $RPM_BUILD_ROOT/usr/%{_lib}
 for dir in ../xc/doc/man/{GL/gl,GL/glx,GLU}; do
 pushd $dir
   xmkmf -a
-  make
+  make %{?jobs:-j%jobs};
   make install.man DESTDIR=$RPM_BUILD_ROOT MANPATH=%{_mandir} LIBMANSUFFIX=3gl
 popd
 done