Move headers and provides from core to main

This commit is contained in:
Nicolas Chauvet 2019-10-26 08:37:48 +02:00
parent d468e2de08
commit 1c348543bb

View File

@ -64,14 +64,9 @@ Requires: %{name}-gles%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-glx%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-glx%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-egl%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-egl%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-core-devel%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-core-devel%{?_isa} = %{epoch}:%{version}-%{release}
# Required by any glx.h users.
%description devel Requires: libX11-devel%{?_isa}
The %{name}-devel package contains libraries and header files for # We might split into more sub-packages
developing applications that use %{name}.
%package core-devel
Summary: Core development files for %{name}
Obsoletes: mesa-libGLES-devel < 19.2.2-2 Obsoletes: mesa-libGLES-devel < 19.2.2-2
Provides: mesa-libGLES-devel Provides: mesa-libGLES-devel
Provides: mesa-libGLES-devel%{?_isa} Provides: mesa-libGLES-devel%{?_isa}
@ -81,6 +76,14 @@ Provides: mesa-khr-devel%{?_isa}
Provides: libGLES-devel Provides: libGLES-devel
Provides: libGLES-devel%{?_isa} Provides: libGLES-devel%{?_isa}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package core-devel
Summary: Core development files for %{name}
%description core-devel %description core-devel
The %{name}-core-devel package is a bootstrap trick for Mesa, which wants The %{name}-core-devel package is a bootstrap trick for Mesa, which wants
to build against the %{name} headers but does not link against any of to build against the %{name} headers but does not link against any of
@ -235,26 +238,29 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
%files core-devel %files core-devel
%dir %{_includedir}/glvnd/ %dir %{_includedir}/glvnd/
%{_includedir}/glvnd/*.h
%{_libdir}/pkgconfig/libglvnd.pc
%files devel
%dir %{_includedir}/EGL/ %dir %{_includedir}/EGL/
%dir %{_includedir}/GL/ %dir %{_includedir}/GL/
%dir %{_includedir}/GLES/ %dir %{_includedir}/GLES/
%dir %{_includedir}/GLES2/ %dir %{_includedir}/GLES2/
%dir %{_includedir}/GLES3/ %dir %{_includedir}/GLES3/
%dir %{_includedir}/KHR/ %dir %{_includedir}/KHR/
%{_includedir}/glvnd/*.h
%{_includedir}/EGL/*.h %{_includedir}/EGL/*.h
%{_includedir}/GL/*.h %{_includedir}/GL/*.h
%{_includedir}/GLES/*.h %{_includedir}/GLES/*.h
%{_includedir}/GLES2/*.h %{_includedir}/GLES2/*.h
%{_includedir}/GLES3/*.h %{_includedir}/GLES3/*.h
%{_includedir}/KHR/*.h %{_includedir}/KHR/*.h
%{_libdir}/pkgconfig/*.pc
%files devel
%{_libdir}/lib*.so %{_libdir}/lib*.so
%if 0%{?_without_mesa_glvnd_default} %if 0%{?_without_mesa_glvnd_default}
%{_libdir}/%{name}/lib*.so %{_libdir}/%{name}/lib*.so
%endif %endif
%{_libdir}/pkgconfig/gl*.pc
%{_libdir}/pkgconfig/egl.pc
%{_libdir}/pkgconfig/opengl.pc
%changelog %changelog