packages: Mesa/Mesa.spec - moved gbm r300/r600 drivers to proper bcond - fi...

[qboosh]

Author: qboosh                       Date: Fri Mar  9 20:13:08 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved gbm r300/r600 drivers to proper bcond
- fixed libOSMesa symlinks packaging

---- Files affected:
packages/Mesa:
   Mesa.spec (1.304 -> 1.305) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.304 packages/Mesa/Mesa.spec:1.305
--- packages/Mesa/Mesa.spec:1.304	Sat Feb 25 21:17:25 2012
+++ packages/Mesa/Mesa.spec	Fri Mar  9 21:13:03 2012
@@ -642,18 +642,18 @@
 %endif
 
 %configure $common_flags \
-	--enable-shared-glapi \
 	%{__enable gbm} \
+	--enable-shared-glapi \
 %if %{with egl}
 	--enable-egl \
 	--enable-gles1 \
 	--enable-gles2 \
 %endif
 %if %{with gallium}
-	--enable-openvg \
 	--enable-gallium-llvm \
 	%{__enable egl gallium-egl} \
 	%{__enable gbm gallium-gbm} \
+	--enable-openvg \
 	--enable-vdpau \
 	--enable-xvmc \
 	--with-gallium-drivers=${gallium_drivers} \
@@ -674,7 +674,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with osmesa}
-cp -p osmesa8/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
+cp -dp osmesa8/libOSMesa* $RPM_BUILD_ROOT%{_libdir}
 cp -p osmesa8/osmesa.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 %endif
 
@@ -717,17 +717,17 @@
 %attr(755,root,root) %{_libdir}/libglapi.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libglapi.so.0
 %if %{with gbm}
-%dir %{_libdir}/gbm
 %attr(755,root,root) %{_libdir}/libgbm.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgbm.so.1
+%dir %{_libdir}/gbm
 %endif
 %if %{with gallium}
 %dir %{_libdir}/egl
 %attr(755,root,root) %{_libdir}/egl/egl_gallium.so
-%attr(755,root,root) %{_libdir}/gbm/pipe_r300.so
-%attr(755,root,root) %{_libdir}/gbm/pipe_r600.so
 %if %{with gbm}
 %attr(755,root,root) %{_libdir}/gbm/gbm_gallium_drm.so
+%attr(755,root,root) %{_libdir}/gbm/pipe_r300.so
+%attr(755,root,root) %{_libdir}/gbm/pipe_r600.so
 %attr(755,root,root) %{_libdir}/gbm/pipe_vmwgfx.so
 %if %{with gallium_nouveau}
 %attr(755,root,root) %{_libdir}/gbm/pipe_nouveau.so
@@ -936,6 +936,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.305  2012/03/09 20:13:03  qboosh
+- moved gbm r300/r600 drivers to proper bcond
+- fixed libOSMesa symlinks packaging
+
 Revision 1.304  2012/02/25 20:17:25  qboosh
 - updated some versioned dependencies
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Mesa/Mesa.spec?r1=1.304&r2=1.305&f=u