From b49ca9f39d924b8ee7bb3ef5600c07eeaf52dfd1 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Tue, 6 May 2014 09:16:59 +0200
Subject: [PATCH 1/3] Move gallium-pipe to the correct sub-package -
 rhbz#1094588

---
 mesa.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mesa.spec b/mesa.spec
index 90f188c..7ce625d 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -541,10 +541,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 %{_libdir}/dri/swrast_dri.so
-%ifarch %{arm}
 %dir %{_libdir}/gallium-pipe
 %{_libdir}/gallium-pipe/*.so
-%endif
 
 %if %{with_hardware}
 %if 0%{?with_omx}
@@ -671,7 +669,6 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{?with_opencl}
 %files libOpenCL
 %{_libdir}/libMesaOpenCL.so.*
-%{_libdir}/gallium-pipe/
 %{_sysconfdir}/OpenCL/vendors/mesa.icd
 
 %files libOpenCL-devel

From 45f61b238bea4388b74bc1e6ecd3bc3b33eaf75e Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Tue, 6 May 2014 09:21:28 +0200
Subject: [PATCH 2/3] Move egl_gallium.so to the correct location -
 rhbz#1094588

---
 mesa.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mesa.spec b/mesa.spec
index 7ce625d..32bfc18 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -490,6 +490,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/COPYING
 %{_libdir}/libEGL.so.1
 %{_libdir}/libEGL.so.1.*
+%dir %{_libdir}/egl
+%{_libdir}/egl/egl_gallium.so
 
 %files libGLES
 %defattr(-,root,root,-)
@@ -591,8 +593,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/KHR/khrplatform.h
 %{_libdir}/pkgconfig/egl.pc
 %{_libdir}/libEGL.so
-%dir %{_libdir}/egl
-%{_libdir}/egl/egl_gallium.so
 
 %files libGLES-devel
 %defattr(-,root,root,-)

From c75058be4c410e1c42540899bf5517c30fa34eea Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com>
Date: Tue, 6 May 2014 09:34:01 +0200
Subject: [PATCH 3/3] Switch from with to enable for llvm shared libs

---
 mesa.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mesa.spec b/mesa.spec
index 32bfc18..a79dcca 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -401,7 +401,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope
     --enable-glx-tls \
     --enable-texture-float=yes \
     %{?with_llvm:--enable-gallium-llvm} \
-    %{?with_llvm:--with-llvm-shared-libs} \
+    %{?with_llvm:--enable-llvm-shared-libs} \
     --enable-dri \
 %if %{with_hardware}
     %{?with_xa:--enable-xa} \