forgot to run ./pre_checkin.sh ...

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=870
This commit is contained in:
Stefan Dirsch 2019-09-26 15:45:32 +00:00 committed by Git OBS Bridge
parent ee5b7cd70a
commit 16b61d0a8e
2 changed files with 22 additions and 1 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- no longer build
* Mesa-libGL-devel
* Mesa-libEGL-devel
* Mesa-libGLESv1_CM-devel
* Mesa-libGLESv2-devel
Instead of requiring these let Mesa-devel package require
libglvnd-devel >= 1.2.0, which provides the contents of these
packages now
-------------------------------------------------------------------
Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -37,7 +37,7 @@
%define libglvnd 0
%if 0%{?suse_version} >= 1330
%define libglvnd 1
%define libglvnd 120
%endif
%define glamor 1
@ -260,6 +260,7 @@ Requires: Mesa-dri-devel = %{version}
Requires: Mesa-libglapi-devel = %{version}
Requires: libOSMesa-devel = %{version}
Requires: libgbm-devel
Requires: libglvnd-devel >= 1.2.0
Provides: Mesa-devel-static = %{version}
Provides: xorg-x11-Mesa-devel = %{version}
Obsoletes: Mesa-devel-static < %{version}
@ -969,6 +970,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/libEGL.so.1*
%endif
%if 0%{?libglvnd} < 120
%files libEGL-devel
%{_includedir}/EGL
%if !0%{?libglvnd}
@ -979,6 +981,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%files KHR-devel
%dir %{_includedir}/KHR
%{_includedir}/KHR
%endif
%files libGL1
%if 0%{?libglvnd}
@ -988,6 +991,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/libGL.so.1*
%endif
%if 0%{?libglvnd} < 120
%files libGL-devel
%dir %{_includedir}/GL
%{_includedir}/GL/*.h
@ -997,30 +1001,35 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%endif
%{_libdir}/pkgconfig/gl.pc
%{_mandir}/man3/gl[A-Z]*
%endif
%files libGLESv1_CM1
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv1_CM.so.1*
%endif
%if 0%{?libglvnd} < 120
%files libGLESv1_CM-devel
%{_includedir}/GLES
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv1_CM.so
%endif
%{_libdir}/pkgconfig/glesv1_cm.pc
%endif
%files libGLESv2-2
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv2.so.2*
%endif
%if 0%{?libglvnd} < 120
%files libGLESv2-devel
%{_includedir}/GLES2
%if 0%{?libglvnd} == 0
%{_libdir}/libGLESv2.so
%endif
%{_libdir}/pkgconfig/glesv2.pc
%endif
%files libGLESv3-devel
%{_includedir}/GLES3