Sync with OBS version

diff --git a/packaging/mesa.spec b/packaging/mesa.spec
index 6007f3e..fab3142 100644 (file)
--- a/packaging/mesa.spec
+++ b/packaging/mesa.spec
@@ -9,9 +9,9 @@ License:    MIT
 URL:        http://www.mesa3d.org/beta
 Source0:    %{name}-%{version}.tar.bz2
 Source1:    mesa-rpmlintrc
-BuildRequires:  pkgconfig(wayland-client)
+#BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(glproto)
+#BuildRequires:  pkgconfig(glproto)
 BuildRequires:  pkgconfig(dri2proto)
 BuildRequires:  pkgconfig(xproto)
 BuildRequires:  pkgconfig(xxf86vm)
@@ -24,7 +24,7 @@ BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig autoconf automake
 BuildRequires:  libxml2-python
-BuildRequires:  llvm-devel
+#BuildRequires:  llvm-devel
 BuildRequires:  expat-devel
 BuildRequires:  python-devel
 BuildRequires:  bison
@@ -257,14 +257,12 @@ rm -rf %{buildroot}
 
 %postun libGL -p /sbin/ldconfig
 
-%post libgbm
-/sbin/ldconfig
-rm -rf %{_libdir}/libdricore.so
-ln -sf %{_libdir}/libdricore%{mesa_libversion}.so %{_libdir}/libdricore.so
+%post libgbm -p /sbin/ldconfig
+rm -rf /usr/lib/libdricore.so
+ln -sf /usr/lib/libdricore%{mesa_libversion}.so /usr/lib/libdricore.so
 
-%postun libgbm
-/sbin/ldconfig
-rm -rf %{_libdir}/libdricore.so
+%postun libgbm -p /sbin/ldconfig
+rm -rf /usr/lib/libdricore.so
 
 %post libGLESv2 -p /sbin/ldconfig
 
@@ -297,9 +295,9 @@ rm -rf %{_libdir}/libdricore.so
 %files dri-drivers-devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/dri.pc
-%{_libdir}/dri/r300_dri.so
-%{_libdir}/dri/r600_dri.so
-%{_libdir}/dri/vmwgfx_dri.so
+/usr/lib/dri/r300_dri.so
+/usr/lib/dri/r600_dri.so
+/usr/lib/dri/vmwgfx_dri.so
 
 %files dri-i965-driver
 %defattr(-,root,root,-)
@@ -336,7 +334,7 @@ rm -rf %{_libdir}/libdricore.so
 %defattr(-,root,root,-)
 %{_libdir}/libgbm.so.*
 %{_libdir}/gbm/*
-%{_sysconfdir}/drirc
+/etc/drirc
 %{_libdir}/libdricore%{mesa_libversion}.so*
 
 %files libgbm-devel