From 3e520d73d93d41744149380df412799128ad0650 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 15 Jul 2015 00:01:32 +0100 Subject: Use %%license, minor spec cleanups --- mesa.spec | 54 ++++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) (limited to 'mesa.spec') diff --git a/mesa.spec b/mesa.spec index 2173524..6147b9c 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,3 +1,5 @@ +%{!?_licensedir:%global license %%doc} + %if 0%{?rhel} %define with_private_llvm 1 %define with_wayland 0 @@ -8,7 +10,6 @@ # S390 doesn't have video cards, but we need swrast for xserver's GLX # llvm (and thus llvmpipe) doesn't actually work on ppc32 -# llvm support for ppc64le is supposed to come in llvm-3.5 %ifnarch s390 ppc %define with_llvm 1 %endif @@ -21,13 +22,13 @@ %ifarch s390 s390x ppc %define with_hardware 0 %define base_drivers swrast -%endif -%ifnarch s390 s390x ppc +%else %define with_hardware 1 %define with_vdpau 1 %define with_vaapi 1 %define with_nine 1 %define base_drivers swrast,nouveau,radeon,r200 +%endif %ifarch %{ix86} x86_64 %define platform_drivers ,i915,i965 %define with_ilo 1 @@ -42,7 +43,6 @@ %define with_xa 1 %define with_omx 1 %endif -%endif %define dri_drivers --with-dri-drivers=%{?base_drivers}%{?platform_drivers} @@ -55,7 +55,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 10.7.0 -Release: 0.devel.3.%{git}%{?dist} +Release: 0.devel.4.%{git}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -434,7 +434,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/vdpau/*.so rm -f $RPM_BUILD_ROOT%{_includedir}/GL/w*.h # remove .la files -find $RPM_BUILD_ROOT -name \*.la | xargs rm -f +find $RPM_BUILD_ROOT -name '*.la' -delete # this keeps breaking, check it early. note that the exit from eu-ftr is odd. pushd $RPM_BUILD_ROOT%{_libdir} @@ -478,26 +478,23 @@ rm -rf $RPM_BUILD_ROOT %endif %files libGL -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libGL.so.1 %{_libdir}/libGL.so.1.* %files libEGL -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libEGL.so.1 %{_libdir}/libEGL.so.1.* %files libGLES -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libGLESv2.so.2 %{_libdir}/libGLESv2.so.2.* %files filesystem -%defattr(-,root,root,-) -%doc docs/COPYING docs/Mesa-MLAA-License-Clarification-Email.txt +%license docs/COPYING +%doc docs/Mesa-MLAA-License-Clarification-Email.txt %dir %{_libdir}/dri %if %{with_hardware} %if 0%{?with_vdpau} @@ -506,11 +503,11 @@ rm -rf $RPM_BUILD_ROOT %endif %files libglapi +%license docs/COPYING %{_libdir}/libglapi.so.0 %{_libdir}/libglapi.so.0.* %files dri-drivers -%defattr(-,root,root,-) %if %{with_hardware} %config(noreplace) %{_sysconfdir}/drirc %if !0%{?rhel} @@ -559,12 +556,10 @@ rm -rf $RPM_BUILD_ROOT %if %{with_hardware} %if 0%{?with_omx} %files omx-drivers -%defattr(-,root,root,-) %{_libdir}/bellagio/libomx_mesa.so %endif %if 0%{?with_vdpau} %files vdpau-drivers -%defattr(-,root,root,-) %{_libdir}/vdpau/libvdpau_nouveau.so.1* %{_libdir}/vdpau/libvdpau_r300.so.1* %if 0%{?with_llvm} @@ -577,7 +572,6 @@ rm -rf $RPM_BUILD_ROOT %endif %files libGL-devel -%defattr(-,root,root,-) %{_includedir}/GL/gl.h %{_includedir}/GL/gl_mangle.h %{_includedir}/GL/glext.h @@ -593,7 +587,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/gl.pc %files libEGL-devel -%defattr(-,root,root,-) %dir %{_includedir}/EGL %{_includedir}/EGL/eglext.h %{_includedir}/EGL/egl.h @@ -606,7 +599,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libEGL.so %files libGLES-devel -%defattr(-,root,root,-) %dir %{_includedir}/GLES2 %{_includedir}/GLES2/gl2platform.h %{_includedir}/GLES2/gl2.h @@ -619,53 +611,45 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libGLESv2.so %files libOSMesa -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libOSMesa.so.8* %files libOSMesa-devel -%defattr(-,root,root,-) %dir %{_includedir}/GL %{_includedir}/GL/osmesa.h %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc %files libgbm -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libgbm.so.1 %{_libdir}/libgbm.so.1.* %files libgbm-devel -%defattr(-,root,root,-) %{_libdir}/libgbm.so %{_includedir}/gbm.h %{_libdir}/pkgconfig/gbm.pc %if 0%{?with_wayland} %files libwayland-egl -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %{_libdir}/libwayland-egl.so.1 %{_libdir}/libwayland-egl.so.1.* %files libwayland-egl-devel -%defattr(-,root,root,-) %{_libdir}/libwayland-egl.so %{_libdir}/pkgconfig/wayland-egl.pc %endif %if 0%{?with_xa} %files libxatracker -%defattr(-,root,root,-) -%doc docs/COPYING +%license docs/COPYING %if %{with_hardware} %{_libdir}/libxatracker.so.2 %{_libdir}/libxatracker.so.2.* %endif %files libxatracker-devel -%defattr(-,root,root,-) %if %{with_hardware} %{_libdir}/libxatracker.so %{_includedir}/xa_tracker.h @@ -677,6 +661,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_opencl} %files libOpenCL +%license docs/COPYING %{_libdir}/libMesaOpenCL.so.* %{_sysconfdir}/OpenCL/vendors/mesa.icd @@ -686,6 +671,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_nine} %files libd3d +%license docs/COPYING %dir %{_libdir}/d3d/ %{_libdir}/d3d/*.so.* @@ -696,6 +682,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 14 2015 Peter Robinson 10.7.0-0.devel.4.ea633db +- Use %%license +- Minor spec cleanups + * Tue Jul 14 2015 Igor Gnatenko - 10.7.0-0.devel.3.ea633db - ea633db -- cgit