SHA256
1
0
forked from pool/Mesa

Accepting request 106364 from home:coolo:branches:openSUSE:Factory

- fix requires of devel package in moving the %package before the
  other packages that have custom versions.
  %version in rpm is tricky - it's the _last_ version before the 
  macro, not the main one.

OBS-URL: https://build.opensuse.org/request/show/106364
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=193
This commit is contained in:
Stefan Dirsch 2012-02-21 23:59:17 +00:00 committed by Git OBS Bridge
parent 2510997112
commit 228d28d76c
2 changed files with 56 additions and 43 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Feb 21 19:53:03 UTC 2012 - coolo@suse.com
- fix requires of devel package in moving the %package before the
other packages that have custom versions.
%version in rpm is tricky - it's the _last_ version before the
macro, not the main one.
-------------------------------------------------------------------
Tue Feb 21 03:57:14 UTC 2012 - jengelh@medozas.de

View File

@ -19,10 +19,9 @@
#
%define _version 7.11.1
Name: Mesa
Version: 7.11.1
Release: 0
Name: Mesa
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: bison
@ -55,13 +54,18 @@ BuildRequires: pkgconfig(xxf86vm)
BuildRequires: llvm-devel
%endif
Url: http://www.mesa3d.org
Provides: xorg-x11-Mesa = %{version} intel-i810-Mesa = %{version} Mesa7 = %{version}
Obsoletes: xorg-x11-Mesa < %{version} intel-i810-Mesa < %{version} Mesa7 < %{version}
Provides: Mesa7 = %{version}
Obsoletes: Mesa7 < %{version}
Provides: intel-i810-Mesa = %{version}
Obsoletes: intel-i810-Mesa < %{version}
Provides: xorg-x11-Mesa = %{version}
Obsoletes: xorg-x11-Mesa < %{version}
Obsoletes: Mesa-nouveau3d
# bug437293
%ifarch ppc64
Obsoletes: XFree86-Mesa-64bit < %{version} Mesa-64bit < %{version}
Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version}
Provides: Mesa-64bit < %{version}
Provides: XFree86-Mesa-64bit = %{version}
%endif
#
Summary: System for rendering interactive 3-D graphics
@ -96,6 +100,45 @@ just Mesa or The Mesa 3-D graphics library.
* OpenGL is a trademark of Silicon Graphics Incorporated.
%package devel
Summary: Libraries, includes and more to develop Mesa applications
Group: Development/Libraries/X11
Requires: Mesa = %version
Requires: Mesa-libEGL-devel = %version
Requires: Mesa-libGL-devel = %version
Requires: Mesa-libGLESv1_CM-devel = %version
Requires: Mesa-libGLESv2-devel = %version
Requires: Mesa-libGLU-devel = %version
Requires: Mesa-libIndirectGL1 = %version
Requires: libOSMesa7 = %version
Requires: Mesa-libglapi0 = %version
Requires: libgbm-devel
# bug437293
%ifarch ppc64
Obsoletes: XFree86-Mesa-devel-64bit < %{version} Mesa-devel-64bit < %{version}
Provides: Mesa-devel-64bit = %{version}
Provides: XFree86-Mesa-devel-64bit = %{version}
%endif
#
Provides: Mesa-devel-static = %{version}
Provides: xorg-x11-Mesa-devel = %{version}
Obsoletes: xorg-x11-Mesa-devel < %{version} Mesa-devel-static < %{version}
%description devel
Mesa is a 3-D graphics library with an API which is very similar to
that of OpenGL.* To the extent that Mesa utilizes the OpenGL command
syntax or state machine, it is being used with authorization from
Silicon Graphics, Inc.(SGI). However, the author does not possess an
OpenGL license from SGI, and makes no claim that Mesa is in any way a
compatible replacement for OpenGL or associated with SGI. Those who
want a licensed implementation of OpenGL should contact a licensed
vendor.
Please do not refer to the library as MesaGL (for legal reasons). It's
just Mesa or The Mesa 3-D graphics library.
* OpenGL is a trademark of Silicon Graphics Incorporated.
%package -n Mesa-libEGL1
# Kudos to Debian for the descriptions
Summary: Free implementation of the EGL API
@ -309,44 +352,6 @@ The Mesa GL API module is responsible for dispatching all the gl*
functions. It is intended to be mainly used by the Mesa-libGLES*
packages.
%package devel
Summary: Libraries, includes and more to develop Mesa applications
Group: Development/Libraries/X11
Requires: Mesa = %version, Mesa-libEGL-devel = %version
Requires: Mesa-libGL-devel = %version, Mesa-libGLESv1_CM-devel = %version
Requires: Mesa-libGLESv2-devel = %version, Mesa-libGLU-devel = %version
Requires: Mesa-libIndirectGL1 = %version, libOSMesa7 = %version
Requires: libgbm-devel, Mesa-libglapi0 = %version
# bug437293
%ifarch ppc64
Obsoletes: XFree86-Mesa-devel-64bit < %{version} Mesa-devel-64bit < %{version}
Provides: XFree86-Mesa-devel-64bit = %{version} Mesa-devel-64bit = %{version}
%endif
#
Provides: xorg-x11-Mesa-devel = %{version} Mesa-devel-static = %{version}
Obsoletes: xorg-x11-Mesa-devel < %{version} Mesa-devel-static < %{version}
%description devel
Mesa is a 3-D graphics library with an API which is very similar to
that of OpenGL.* To the extent that Mesa utilizes the OpenGL command
syntax or state machine, it is being used with authorization from
Silicon Graphics, Inc.(SGI). However, the author does not possess an
OpenGL license from SGI, and makes no claim that Mesa is in any way a
compatible replacement for OpenGL or associated with SGI. Those who
want a licensed implementation of OpenGL should contact a licensed
vendor.
Please do not refer to the library as MesaGL (for legal reasons). It's
just Mesa or The Mesa 3-D graphics library.
* OpenGL is a trademark of Silicon Graphics Incorporated.
Authors:
--------
Brian Paul
%prep
%setup -n %{name}-%{_version} -b4 -q
# no need to build (GLUT-)Demos