rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 576934 from home:mimi_vx:test

Browse Source 
- remove %{release} based dependecies
   Unfortuanetly Mesa and Mesa-drivers can have different release number
   Release is Commit_Count.Build_Count and build count can be different
   because both packages have different dependencies

- remove %{release} based dependecies
   Unfortuanetly Mesa and Mesa-drivers can have different release number
   Release is Commit_Count.Build_Count and build count can be different
   because both packages have different dependencies

OBS-URL: https://build.opensuse.org/request/show/576934
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=702
This commit is contained in:
Stefan Dirsch 2018-02-15 09:31:00 +00:00 committed by Git OBS Bridge
parent 111fa9f12e
commit 85a8c9217e
4 changed files with 100 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mesa-drivers.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Feb 15 09:25:16 UTC 2018 - mimi.vx@gmail.com
- remove %{release} based dependecies
Unfortuanetly Mesa and Mesa-drivers can have different release number
Release is Commit_Count.Build_Count and build count can be different
because both packages have different dependencies
-------------------------------------------------------------------
Wed Feb 14 09:48:41 UTC 2018 - mimi.vx@gmail.com

84
Mesa-drivers.spec
View File

@ -232,16 +232,16 @@ BuildRequires: libclc
%endif
%if 0%{?libglvnd}
Requires: Mesa-libEGL1 = %{version}-%{release}
Requires: Mesa-libGL1 = %{version}-%{release}
Requires: Mesa-libEGL1 = %{version}
Requires: Mesa-libGL1 = %{version}
Requires: libglvnd >= 0.1.0
%endif
# This dependency on Mesa-dri and Mesa-gallium is here to make sure users that
# do not install recommends on their system still get working Mesa. It is
# ignored in obs when Mesa is installed as build dependency.
Requires: Mesa-dri = %{version}-%{release}
Requires: Mesa-gallium = %{version}-%{release}
Requires: Mesa-dri = %{version}
Requires: Mesa-gallium = %{version}
%description
Mesa is a 3-D graphics library with an API which is very similar to
@ -261,25 +261,25 @@ just Mesa or The Mesa 3-D graphics library.
%package devel
Summary: Libraries, includes and more to develop Mesa applications
Group: Development/Libraries/X11
Requires: Mesa = %{version}-%{release}
Requires: Mesa-dri-devel = %{version}-%{release}
Requires: Mesa-libEGL-devel = %{version}-%{release}
Requires: Mesa-libGL-devel = %{version}-%{release}
Requires: Mesa-libGLESv1_CM-devel = %{version}-%{release}
Requires: Mesa-libGLESv2-devel = %{version}-%{release}
Requires: Mesa-libglapi-devel = %{version}-%{release}
Requires: libOSMesa-devel = %{version}-%{release}
Requires: Mesa = %{version}
Requires: Mesa-dri-devel = %{version}
Requires: Mesa-libEGL-devel = %{version}
Requires: Mesa-libGL-devel = %{version}
Requires: Mesa-libGLESv1_CM-devel = %{version}
Requires: Mesa-libGLESv2-devel = %{version}
Requires: Mesa-libglapi-devel = %{version}
Requires: libOSMesa-devel = %{version}
Requires: libgbm-devel
Provides: Mesa-devel-static = %{version}-%{release}
Provides: xorg-x11-Mesa-devel = %{version}-%{release}
Obsoletes: Mesa-devel-static < %{version}-%{release}
Obsoletes: xorg-x11-Mesa-devel < %{version}-%{release}
Provides: Mesa-libIndirectGL-devel = %{version}-%{release}
Obsoletes: Mesa-libIndirectGL-devel < %{version}-%{release}
Provides: s2tc-devel = %{version}-%{release}
Obsoletes: s2tc-devel < %{version}-%{release}
Provides: libtxc_dxtn-devel = %{version}-%{release}
Obsoletes: libtxc_dxtn-devel < %{version}-%{release}
Provides: Mesa-devel-static = %{version}
Provides: xorg-x11-Mesa-devel = %{version}
Obsoletes: Mesa-devel-static < %{version}
Obsoletes: xorg-x11-Mesa-devel < %{version}
Provides: Mesa-libIndirectGL-devel = %{version}
Obsoletes: Mesa-libIndirectGL-devel < %{version}
Provides: s2tc-devel = %{version}
Obsoletes: s2tc-devel < %{version}
Provides: libtxc_dxtn-devel = %{version}
Obsoletes: libtxc_dxtn-devel < %{version}
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
Requires: libwayland-egl-devel
%endif
@ -321,7 +321,7 @@ support.
%package libEGL-devel
Summary: Development files for the EGL API
Group: Development/Libraries/C and C++
Requires: Mesa-libEGL1 = %{version}-%{release}
Requires: Mesa-libEGL1 = %{version}
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
@ -340,7 +340,7 @@ programs against the EGL library.
%package libGL1
Summary: The GL/GLX runtime of the Mesa 3D graphics library
Group: System/Libraries
Requires: Mesa = %{version}-%{release}
Requires: Mesa = %{version}
%if 0%{?libglvnd}
Requires: libglvnd >= 0.1.0
%endif
@ -358,7 +358,7 @@ the X Window System.
%package libGL-devel
Summary: GL/GLX development files of the OpenGL API
Group: Development/Libraries/C and C++
Requires: Mesa-libGL1 = %{version}-%{release}
Requires: Mesa-libGL1 = %{version}
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
@ -389,7 +389,7 @@ OpenGL|ES 1.x provides an API for fixed-function hardware.
%package libGLESv1_CM-devel
Summary: Development files for the OpenGL ES 1.x API
Group: Development/Libraries/C and C++
Requires: Mesa-libGLESv1_CM1 = %{version}-%{release}
Requires: Mesa-libGLESv1_CM1 = %{version}
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
@ -428,7 +428,7 @@ ES 3 entry points.
%package libGLESv2-devel
Summary: Development files for the OpenGL ES 2.x API
Group: Development/Libraries/C and C++
Requires: Mesa-libGLESv2-2 = %{version}-%{release}
Requires: Mesa-libGLESv2-2 = %{version}
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
@ -450,7 +450,7 @@ applications using the OpenGL|ES 2.x APIs.
Summary: Development files for the OpenGL ES 3.x API
Group: Development/Libraries/C and C++
%if 0%{?libglvnd} == 0
Requires: Mesa-libGLESv2-2 = %{version}-%{release}
Requires: Mesa-libGLESv2-2 = %{version}
%endif
Requires: pkgconfig(egl)
@ -467,8 +467,8 @@ applications using the OpenGL|ES 3.x APIs.
Summary: Mesa Off-screen rendering extension
# Wrongly named package shipped .so.8
Group: System/Libraries
Obsoletes: libOSMesa9 < %{version}-%{release}
Provides: libOSMesa9 = %{version}-%{release}
Obsoletes: libOSMesa9 < %{version}
Provides: libOSMesa9 = %{version}
%description -n libOSMesa8
OSmesa is a Mesa extension that allows programs to render to an
@ -478,7 +478,7 @@ rendering context on an X Server. It uses a pure software renderer.
%package -n libOSMesa-devel
Summary: Development files for the Mesa Offscreen Rendering extension
Group: Development/Libraries/C and C++
Requires: libOSMesa8 = %{version}-%{release}
Requires: libOSMesa8 = %{version}
%description -n libOSMesa-devel
Development files for the OSmesa Mesa extension that allows programs to render to an
@ -497,7 +497,7 @@ packages.
%package libglapi-devel
Summary: Development files for the Mesa GL API implementation
Group: Development/Libraries/C and C++
Requires: Mesa-libglapi0 = %{version}-%{release}
Requires: Mesa-libglapi0 = %{version}
%description libglapi-devel
Development files for the Mesa GL API module which is responsible for
@ -507,7 +507,7 @@ the Mesa-libGLES* packages.
%package -n Mesa-dri
Summary: DRI plug-ins for 3D acceleration
Group: System/Libraries
Requires: Mesa = %{version}-%{release}
Requires: Mesa = %{version}
Supplements: Mesa
%description -n Mesa-dri
@ -516,7 +516,7 @@ This package contains Mesa DRI drivers for 3D acceleration.
%package dri-devel
Summary: Development files for the DRI API
Group: Development/Libraries/C and C++
Requires: Mesa = %{version}-%{release}
Requires: Mesa = %{version}
%description dri-devel
This package contains the development environment required for
@ -525,7 +525,7 @@ compiling programs and libraries using the DRI API.
%package -n Mesa-dri-nouveau
Summary: Mesa DRI plug-in for 3D acceleration via Nouveau
Group: System/Libraries
Requires: Mesa = %{version}-%{release}
Requires: Mesa = %{version}
Supplements: xf86-video-nouveau
%description -n Mesa-dri-nouveau
@ -536,7 +536,7 @@ since it is still experimental.
%package -n Mesa-gallium
Summary: Mesa Gallium GPU drivers
Group: System/Libraries
Requires: Mesa = %{version}-%{release}
Requires: Mesa = %{version}
Supplements: Mesa
%description -n Mesa-gallium
@ -557,7 +557,7 @@ openwfd.
%package -n libgbm-devel
Summary: Development files for the EGL API
Group: Development/Libraries/C and C++
Requires: libgbm1 = %{version}-%{release}
Requires: libgbm1 = %{version}
%description -n libgbm-devel
This package contains the GBM buffer management library. It provides
@ -582,7 +582,7 @@ that need not run full-screen and cooperate with a compositor.
%package -n libwayland-egl-devel
Summary: Development files for libwayland-egl1
Group: Development/Libraries/C and C++
Requires: libwayland-egl1 = %{version}-%{release}
Requires: libwayland-egl1 = %{version}
%description -n libwayland-egl-devel
This package is required to link wayland client applications to the EGL
@ -604,7 +604,7 @@ Mesa Direct3D9 state tracker
%package -n Mesa-libd3d-devel
Summary: Mesa Direct3D9 state tracker development package
Group: Development/Libraries/C and C++
Requires: Mesa-libd3d = %{version}-%{release}
Requires: Mesa-libd3d = %{version}
%description -n Mesa-libd3d-devel
Mesa Direct3D9 state tracker development package
@ -695,8 +695,8 @@ This package contains the Vulkan parts for Mesa.
%package -n Mesa-libVulkan-devel
Summary: Mesa's Vulkan development files
Group: Development/Libraries/C and C++
Requires: libvulkan_intel = %{version}-%{release}
Requires: libvulkan_radeon = %{version}-%{release}
Requires: libvulkan_intel = %{version}
Requires: libvulkan_radeon = %{version}
Conflicts: vulkan-devel
%description -n Mesa-libVulkan-devel
@ -719,7 +719,7 @@ Version: 1.0.0
Release: 0
Summary: Development files for the XA API
Group: Development/Libraries/C and C++
Requires: libxatracker2 = %{version}-%{release}
Requires: libxatracker2 = %{version}
%description -n libxatracker-devel
This package contains the XA state tracker for gallium3D driver.

8
Mesa.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Feb 15 09:25:16 UTC 2018 - mimi.vx@gmail.com
- remove %{release} based dependecies
Unfortuanetly Mesa and Mesa-drivers can have different release number
Release is Commit_Count.Build_Count and build count can be different
because both packages have different dependencies
-------------------------------------------------------------------
Wed Feb 14 09:48:41 UTC 2018 - mimi.vx@gmail.com

84
Mesa.spec
View File

@ -231,16 +231,16 @@ BuildRequires: libclc
%endif
%if 0%{?libglvnd}
Requires: Mesa-libEGL1 = %{version}-%{release}
Requires: Mesa-libGL1 = %{version}-%{release}
Requires: Mesa-libEGL1 = %{version}
Requires: Mesa-libGL1 = %{version}
Requires: libglvnd >= 0.1.0
%endif
# This dependency on Mesa-dri and Mesa-gallium is here to make sure users that
# do not install recommends on their system still get working Mesa. It is
# ignored in obs when Mesa is installed as build dependency.
Requires: Mesa-dri = %{version}-%{release}
Requires: Mesa-gallium = %{version}-%{release}
Requires: Mesa-dri = %{version}
Requires: Mesa-gallium = %{version}
%description
Mesa is a 3-D graphics library with an API which is very similar to
@ -260,25 +260,25 @@ just Mesa or The Mesa 3-D graphics library.
%package devel
Summary: Libraries, includes and more to develop Mesa applications
Group: Development/Libraries/X11
Requires: Mesa = %{version}-%{release}
Requires: Mesa-dri-devel = %{version}-%{release}
Requires: Mesa-libEGL-devel = %{version}-%{release}
Requires: Mesa-libGL-devel = %{version}-%{release}
Requires: Mesa-libGLESv1_CM-devel = %{version}-%{release}
Requires: Mesa-libGLESv2-devel = %{version}-%{release}
Requires: Mesa-libglapi-devel = %{version}-%{release}
Requires: libOSMesa-devel = %{version}-%{release}
Requires: Mesa = %{version}
Requires: Mesa-dri-devel = %{version}
Requires: Mesa-libEGL-devel = %{version}
Requires: Mesa-libGL-devel = %{version}
Requires: Mesa-libGLESv1_CM-devel = %{version}
Requires: Mesa-libGLESv2-devel = %{version}
Requires: Mesa-libglapi-devel = %{version}
Requires: libOSMesa-devel = %{version}
Requires: libgbm-devel
Provides: Mesa-devel-static = %{version}-%{release}
Provides: xorg-x11-Mesa-devel = %{version}-%{release}
Obsoletes: Mesa-devel-static < %{version}-%{release}
Obsoletes: xorg-x11-Mesa-devel < %{version}-%{release}
Provides: Mesa-libIndirectGL-devel = %{version}-%{release}
Obsoletes: Mesa-libIndirectGL-devel < %{version}-%{release}
Provides: s2tc-devel = %{version}-%{release}
Obsoletes: s2tc-devel < %{version}-%{release}
Provides: libtxc_dxtn-devel = %{version}-%{release}
Obsoletes: libtxc_dxtn-devel < %{version}-%{release}
Provides: Mesa-devel-static = %{version}
Provides: xorg-x11-Mesa-devel = %{version}
Obsoletes: Mesa-devel-static < %{version}
Obsoletes: xorg-x11-Mesa-devel < %{version}
Provides: Mesa-libIndirectGL-devel = %{version}
Obsoletes: Mesa-libIndirectGL-devel < %{version}
Provides: s2tc-devel = %{version}
Obsoletes: s2tc-devel < %{version}
Provides: libtxc_dxtn-devel = %{version}
Obsoletes: libtxc_dxtn-devel < %{version}
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
Requires: libwayland-egl-devel
%endif
@ -320,7 +320,7 @@ support.
%package libEGL-devel
Summary: Development files for the EGL API
Group: Development/Libraries/C and C++
Requires: Mesa-libEGL1 = %{version}-%{release}
Requires: Mesa-libEGL1 = %{version}
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
@ -339,7 +339,7 @@ programs against the EGL library.
%package libGL1
Summary: The GL/GLX runtime of the Mesa 3D graphics library
Group: System/Libraries
Requires: Mesa = %{version}-%{release}
Requires: Mesa = %{version}
%if 0%{?libglvnd}
Requires: libglvnd >= 0.1.0
%endif
@ -357,7 +357,7 @@ the X Window System.
%package libGL-devel
Summary: GL/GLX development files of the OpenGL API
Group: Development/Libraries/C and C++
Requires: Mesa-libGL1 = %{version}-%{release}
Requires: Mesa-libGL1 = %{version}
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
@ -388,7 +388,7 @@ OpenGL|ES 1.x provides an API for fixed-function hardware.
%package libGLESv1_CM-devel
Summary: Development files for the OpenGL ES 1.x API
Group: Development/Libraries/C and C++
Requires: Mesa-libGLESv1_CM1 = %{version}-%{release}
Requires: Mesa-libGLESv1_CM1 = %{version}
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
@ -427,7 +427,7 @@ ES 3 entry points.
%package libGLESv2-devel
Summary: Development files for the OpenGL ES 2.x API
Group: Development/Libraries/C and C++
Requires: Mesa-libGLESv2-2 = %{version}-%{release}
Requires: Mesa-libGLESv2-2 = %{version}
%if 0%{?libglvnd}
Requires: libglvnd-devel >= 0.1.0
%endif
@ -449,7 +449,7 @@ applications using the OpenGL|ES 2.x APIs.
Summary: Development files for the OpenGL ES 3.x API
Group: Development/Libraries/C and C++
%if 0%{?libglvnd} == 0
Requires: Mesa-libGLESv2-2 = %{version}-%{release}
Requires: Mesa-libGLESv2-2 = %{version}
%endif
Requires: pkgconfig(egl)
@ -466,8 +466,8 @@ applications using the OpenGL|ES 3.x APIs.
Summary: Mesa Off-screen rendering extension
# Wrongly named package shipped .so.8
Group: System/Libraries
Obsoletes: libOSMesa9 < %{version}-%{release}
Provides: libOSMesa9 = %{version}-%{release}
Obsoletes: libOSMesa9 < %{version}
Provides: libOSMesa9 = %{version}
%description -n libOSMesa8
OSmesa is a Mesa extension that allows programs to render to an
@ -477,7 +477,7 @@ rendering context on an X Server. It uses a pure software renderer.
%package -n libOSMesa-devel
Summary: Development files for the Mesa Offscreen Rendering extension
Group: Development/Libraries/C and C++
Requires: libOSMesa8 = %{version}-%{release}
Requires: libOSMesa8 = %{version}
%description -n libOSMesa-devel
Development files for the OSmesa Mesa extension that allows programs to render to an
@ -496,7 +496,7 @@ packages.
%package libglapi-devel
Summary: Development files for the Mesa GL API implementation
Group: Development/Libraries/C and C++
Requires: Mesa-libglapi0 = %{version}-%{release}
Requires: Mesa-libglapi0 = %{version}
%description libglapi-devel
Development files for the Mesa GL API module which is responsible for
@ -506,7 +506,7 @@ the Mesa-libGLES* packages.
%package -n Mesa-dri
Summary: DRI plug-ins for 3D acceleration
Group: System/Libraries
Requires: Mesa = %{version}-%{release}
Requires: Mesa = %{version}
Supplements: Mesa
%description -n Mesa-dri
@ -515,7 +515,7 @@ This package contains Mesa DRI drivers for 3D acceleration.
%package dri-devel
Summary: Development files for the DRI API
Group: Development/Libraries/C and C++
Requires: Mesa = %{version}-%{release}
Requires: Mesa = %{version}
%description dri-devel
This package contains the development environment required for
@ -524,7 +524,7 @@ compiling programs and libraries using the DRI API.
%package -n Mesa-dri-nouveau
Summary: Mesa DRI plug-in for 3D acceleration via Nouveau
Group: System/Libraries
Requires: Mesa = %{version}-%{release}
Requires: Mesa = %{version}
Supplements: xf86-video-nouveau
%description -n Mesa-dri-nouveau
@ -535,7 +535,7 @@ since it is still experimental.
%package -n Mesa-gallium
Summary: Mesa Gallium GPU drivers
Group: System/Libraries
Requires: Mesa = %{version}-%{release}
Requires: Mesa = %{version}
Supplements: Mesa
%description -n Mesa-gallium
@ -556,7 +556,7 @@ openwfd.
%package -n libgbm-devel
Summary: Development files for the EGL API
Group: Development/Libraries/C and C++
Requires: libgbm1 = %{version}-%{release}
Requires: libgbm1 = %{version}
%description -n libgbm-devel
This package contains the GBM buffer management library. It provides
@ -581,7 +581,7 @@ that need not run full-screen and cooperate with a compositor.
%package -n libwayland-egl-devel
Summary: Development files for libwayland-egl1
Group: Development/Libraries/C and C++
Requires: libwayland-egl1 = %{version}-%{release}
Requires: libwayland-egl1 = %{version}
%description -n libwayland-egl-devel
This package is required to link wayland client applications to the EGL
@ -603,7 +603,7 @@ Mesa Direct3D9 state tracker
%package -n Mesa-libd3d-devel
Summary: Mesa Direct3D9 state tracker development package
Group: Development/Libraries/C and C++
Requires: Mesa-libd3d = %{version}-%{release}
Requires: Mesa-libd3d = %{version}
%description -n Mesa-libd3d-devel
Mesa Direct3D9 state tracker development package
@ -694,8 +694,8 @@ This package contains the Vulkan parts for Mesa.
%package -n Mesa-libVulkan-devel
Summary: Mesa's Vulkan development files
Group: Development/Libraries/C and C++
Requires: libvulkan_intel = %{version}-%{release}
Requires: libvulkan_radeon = %{version}-%{release}
Requires: libvulkan_intel = %{version}
Requires: libvulkan_radeon = %{version}
Conflicts: vulkan-devel
%description -n Mesa-libVulkan-devel
@ -718,7 +718,7 @@ Version: 1.0.0
Release: 0
Summary: Development files for the XA API
Group: Development/Libraries/C and C++
Requires: libxatracker2 = %{version}-%{release}
Requires: libxatracker2 = %{version}
%description -n libxatracker-devel
This package contains the XA state tracker for gallium3D driver.