Use %%license, minor spec cleanups

This commit is contained in:
Peter Robinson 2015-07-15 00:01:32 +01:00
parent 9739a7407b
commit 3e520d73d9
2 changed files with 24 additions and 142 deletions

112
.gitignore vendored
View file

@ -1,113 +1,5 @@
*.jx
*.src.rpm
.build*
mesa-20100208.tar.bz2
gl-manpages-1.0.1.tar.bz2
xdriinfo-1.0.3.tar.bz2
mesa-demos-20100529.tar.bz2
mesa-20100529.tar.bz2
mesa-20100612.tar.bz2
mesa-20100709.tar.bz2
mesa-20100720.tar.bz2
/mesa-20100824.tar.bz2
/mesa-20101020.tar.bz2
/mesa-20101108.tar.bz2
/mesa-20101118.tar.bz2
/mesa-20101129.tar.bz2
/mesa-20101214.tar.xz
/mesa-20101216.tar.xz
/mesa-20110107.tar.xz
/mesa-20110315.tar.xz
/mesa-20110327.tar.xz
/MesaLib-7.10.1.tar.bz2
/mesa-20110327.tar.xz
/mesa-20110330.tar.xz
/mesa-20110401.tar.xz
/mesa-20110412.tar.xz
/mesa-20110620.tar.xz
/mesa-20110730.tar.xz
/MesaLib-7.11.tar.bz2
/mesa-20111103.tar.xz
/mesa-20111114.tar.xz
/mesa-20111129.tar.xz
/mesa-20111214.tar.xz
/mesa-20120105.tar.xz
/mesa-20120126.tar.xz
/MesaLib-8.0.tar.bz2
/MesaLib-8.0.1.tar.bz2
/MesaLib-8.0.2.tar.bz2
/mesa-20120424.tar.xz
/mesa-20120603.tar.xz
/mesa-20120716.tar.xz
/mesa-20120717.tar.xz
/mesa-20120816.tar.xz
/mesa-20120827.tar.xz
/mesa-20120924.tar.xz
/glu-9.0.0.tar.bz2
/MesaLib-9.0.tar.bz2
/MesaLib-9.0.1.tar.bz2
/mesa-20130213.tar.xz
/MesaLib-9.1.tar.bz2
/MesaLib-9.1.1.tar.bz2
/mesa-20130508.tar.xz
/mesa-20130514.tar.xz
/mesa-20130528.tar.xz
/mesa-20130610.tar.xz
/mesa-20130723.tar.xz
/mesa-20130902.tar.xz
/mesa-20130919.tar.xz
/mesa-20131113.tar.xz
/mesa-20131114.tar.xz
/mesa-20131128.tar.xz
/mesa-20131206.tar.xz
/mesa-20131220.tar.xz
/mesa-20140206.tar.xz
/mesa-20140208.tar.xz
/mesa-20140222.tar.xz
/mesa-20140225.tar.xz
/mesa-20140301.tar.xz
/mesa-20140305.tar.xz
/mesa-20140419.tar.xz
/mesa-20140430.tar.xz
/mesa-20140505.tar.xz
/mesa-20140510.tar.xz
/mesa-20140517.tar.xz
/mesa-20140524.tar.xz
/mesa-20140531.tar.xz
/mesa-20140608.tar.xz
/mesa-20140625.tar.xz
/mesa-20140711.tar.xz
/mesa-f381c27c548aa28b003c8e188f5d627ab4105f76.tar.xz
/mesa-c40d7d6d948912a4d51cbf8f0854cf2ebe916636.tar.xz
/mesa-e7f2f2dea5acdbd1a12ed88914e64a38a97432f0.tar.xz
/mesa-c2867f5b3626157379ef0d4d5bcaf5180ca0ec1f.tar.xz
/mesa-80771e47b6c1e47ab55f17311e1d4e227a9eb3d8.tar.xz
/mesa-1f184bc.tar.xz
/mesa-c3f17bb.tar.xz
/mesa-1a17098.tar.xz
/mesa-f3b709c.tar.xz
/mesa-9460cd3.tar.xz
/mesa-3d9c1a9.tar.xz
/mesa-29c7cf2.tar.xz
/mesa-0d7f4c8.tar.xz
/mesa-cb5a372.tar.xz
/mesa-0c7f895.tar.xz
/mesa-6c18279.tar.xz
/mesa-64dcb2b.tar.xz
/mesa-3ba57ba.tar.xz
/mesa-609c3e5.tar.xz
/mesa-be0311c.tar.xz
/mesa-a6f6d61.tar.xz
/mesa-c633528.tar.xz
/mesa-b77eaaf.tar.xz
/mesa-290553b.tar.xz
/mesa-c3260f8.tar.xz
/mesa-6171131.tar.xz
/mesa-20150218.tar.xz
/mesa-f80af89.tar.xz
/mesa-3282e57.tar.xz
/mesa-c1485f4.tar.xz
/mesa-51e3453.tar.xz
/mesa-5a55f68.tar.xz
/mesa-8787141.tar.xz
/mesa-ea633db.tar.xz
/mesa-*.tar.bz2
/mesa-*.tar.xz

View file

@ -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 <pbrobinson@fedoraproject.org> 10.7.0-0.devel.4.ea633db
- Use %%license
- Minor spec cleanups
* Tue Jul 14 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 10.7.0-0.devel.3.ea633db
- ea633db