metalefty/mesa
1
0
Fork 0
forked from rpms/mesa
Code Pull Requests Activity

Cleanups to BuildRequires, Requires, Conflicts, etc.

Browse Source
This commit is contained in:
Adam Jackson 2011-11-16 11:29:47 -05:00
parent ee18eca1e7
commit 0fd2b01338
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mesa.spec
View File

@ -26,7 +26,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 7.12 Version: 7.12
Release: 0.1%{?dist} Release: 0.2%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -45,13 +45,13 @@ Patch8: mesa-7.10-llvmcore.patch
BuildRequires: pkgconfig autoconf automake libtool BuildRequires: pkgconfig autoconf automake libtool
%if %{with_hardware} %if %{with_hardware}
BuildRequires: kernel-headers >= 2.6.27-0.305.rc5.git6 BuildRequires: kernel-headers
BuildRequires: xorg-x11-server-devel BuildRequires: xorg-x11-server-devel
%endif %endif
BuildRequires: libdrm-devel >= 2.4.24-1 BuildRequires: libdrm-devel >= 2.4.27-1
BuildRequires: libXxf86vm-devel BuildRequires: libXxf86vm-devel
BuildRequires: expat-devel >= 2.0 BuildRequires: expat-devel
BuildRequires: xorg-x11-proto-devel >= 7.4-35 BuildRequires: xorg-x11-proto-devel
BuildRequires: makedepend BuildRequires: makedepend
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: libXext-devel BuildRequires: libXext-devel
@ -76,10 +76,7 @@ Group: System Environment/Libraries
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig Requires(postun): /sbin/ldconfig
Provides: libGL Provides: libGL
Requires: libdrm%{?isa} >= 2.4.23-1 Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
%if %{with_hardware}
Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
%endif
%description libGL %description libGL
Mesa libGL runtime library. Mesa libGL runtime library.
@ -90,7 +87,6 @@ Group: System Environment/Libraries
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig Requires(postun): /sbin/ldconfig
Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release} Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
Requires: libdrm%{?isa} >= 2.4.23-1
%description libEGL %description libEGL
Mesa libEGL runtime libraries Mesa libEGL runtime libraries
@ -101,7 +97,6 @@ Group: System Environment/Libraries
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig Requires(postun): /sbin/ldconfig
Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release} Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
Requires: libdrm%{?isa} >= 2.4.23-1
%description libGLES %description libGLES
Mesa GLES runtime libraries Mesa GLES runtime libraries
@ -141,7 +136,6 @@ Summary: Mesa libGL development package
Group: Development/Libraries Group: Development/Libraries
Requires: mesa-libGL = %{version}-%{release} Requires: mesa-libGL = %{version}-%{release}
Provides: libGL-devel Provides: libGL-devel
Conflicts: xorg-x11-proto-devel <= 7.2-12
%description libGL-devel %description libGL-devel
Mesa libGL development package Mesa libGL development package
@ -427,6 +421,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/osmesa.pc %{_libdir}/pkgconfig/osmesa.pc
%changelog %changelog
* Wed Nov 16 2011 Adam Jackson <ajax@redhat.com> 7.12-0.2
- Cleanups to BuildRequires, Requires, Conflicts, etc.
* Mon Nov 14 2011 Dave Airlie <airlied@redhat.com> 7.12-0.1 * Mon Nov 14 2011 Dave Airlie <airlied@redhat.com> 7.12-0.1
- rebase to upstream snapshot of 7.12 - rebase to upstream snapshot of 7.12