packages: Mesa/Mesa.spec - check-files cleanup - fixed build without galliu...

qboosh qboosh at pld-linux.org
Sun Mar 11 11:29:07 CET 2012


Author: qboosh                       Date: Sun Mar 11 10:29:07 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- check-files cleanup
- fixed build without gallium_nouveau

---- Files affected:
packages/Mesa:
   Mesa.spec (1.309 -> 1.310) 

---- Diffs:

================================================================
Index: packages/Mesa/Mesa.spec
diff -u packages/Mesa/Mesa.spec:1.309 packages/Mesa/Mesa.spec:1.310
--- packages/Mesa/Mesa.spec:1.309	Sun Mar 11 10:40:40 2012
+++ packages/Mesa/Mesa.spec	Sun Mar 11 11:29:02 2012
@@ -860,6 +860,8 @@
 
 # strip out undesirable headers
 %{__rm} $RPM_BUILD_ROOT%{_includedir}/GL/{vms_x_fix,wglext,wmesa}.h
+# dlopened by soname
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libXvMC*.so
 
 # remove "OS ABI: Linux 2.4.20" tag, so private copies (nvidia or fglrx),
 # set up via /etc/ld.so.conf.d/*.conf will be preferred over this
@@ -1063,10 +1065,12 @@
 %endif
 
 %if %{with gallium}
+%if %{with gallium_nouveau}
 %files libXvMC-nouveau
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXvMCnouveau.so.1.0
 %attr(755,root,root) %ghost %{_libdir}/libXvMCnouveau.so.1
+%endif
 
 %files libXvMC-r300
 %defattr(644,root,root,755)
@@ -1161,6 +1165,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.310  2012/03/11 10:29:02  qboosh
+- check-files cleanup
+- fixed build without gallium_nouveau
+
 Revision 1.309  2012/03/11 09:40:40  qboosh
 - gbm, XvMC and vdpau modules are rather big, so split them into per-hardware modules:
   Mesa-gbm-driver-{i915,nouveau,r300,r600,vmwgfx}
================================================================

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



More information about the pld-cvs-commit mailing list