Restore hardened build

- Remove ExclusiveArch
- Remove some pointless Provides/Obsoletes
- BuildRequires pkgconfig(xext) not pkgconfig(xv)
- Update description to be a bit more confident
- Dump make check errors into the build log
This commit is contained in:
Adam Jackson 2016-10-12 18:14:32 -04:00
parent 970854bf80
commit b4cc6092be

View File

@ -1,39 +1,28 @@
%undefine _hardened_build
%global commit0 14f6283166001d10074c75a2ce5a6de1aaff5446
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: libglvnd
Version: 0.2.999
Release: 2%{?commit0:.git%{shortcommit0}}%{?dist}
Release: 3%{?commit0:.git%{shortcommit0}}%{?dist}
Summary: The GL Vendor-Neutral Dispatch library
License: MIT
URL: https://github.com/NVIDIA/libglvnd
Source0: https://github.com/NVIDIA/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
#This library is only intended on theses architectures
ExclusiveArch: x86_64 i686 armv7hl
BuildRequires: libtool
BuildRequires: gcc
BuildRequires: libxml2-python
BuildRequires: pkgconfig(glproto)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(xext)
# X11 tests:
#Xvfb is unlikely to reproduce a full Xorg environnement
#So some tests are failing
#Also, at this time, upstream mesa is missing GLX_EXT_libglvnd
#https://github.com/NVIDIA/libglvnd/issues/93
BuildRequires: xorg-x11-server-Xvfb
# Introduced in f23
Provides: xorg-x11-glvnd = 0.1.0
Obsoletes: xorg-x11-glvnd < 0.1.0
%{!?_with_mesa_glvnd_default:
%global __provides_exclude ^(libGL\\.so.*|libEGL\\.so.*|libGLESv2\\.so.*)$
%global __requires_exclude ^(libGL\\.so.*|libEGL\\.so.*|libGLESv2\\.so.*)$
@ -41,12 +30,8 @@ Obsoletes: xorg-x11-glvnd < 0.1.0
%description
This is a work-in-progress implementation of the vendor-neutral dispatch layer
for arbitrating OpenGL API calls between multiple vendors on a per-screen
basis, as described by Andy Ritger's OpenGL ABI proposal.
Currently, only the GLX window-system API and OpenGL are supported, but in the
future this library may support EGL and OpenGL ES as well.
libglvnd is an implementation of the vendor-neutral dispatch layer for
arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
%package devel
Summary: Development files for %{name}
@ -61,7 +46,6 @@ developing applications that use %{name}.
%autosetup -n %{name}-%{?commit0}%{?!commit0:%{version}}
autoreconf -vif
%build
%configure \
--disable-static \
@ -98,7 +82,7 @@ export DO_X11_TESTS=1
#FAIL: testglxqueryversion.sh
#FAIL: testglxnscrthreads.sh
#reported as https://github.com/NVIDIA/libglvnd/issues/93
xvfb-run -a make check V=1 || :
xvfb-run -a make check V=1 || cat `find . -name test-suite.log`
%post -p /sbin/ldconfig
@ -129,6 +113,14 @@ xvfb-run -a make check V=1 || :
%changelog
* Wed Oct 12 2016 Adam Jackson <ajax@redhat.com> - 0.2.999-3.git14f6283
- Restore hardened build
- Remove ExclusiveArch
- Remove some pointless Provides/Obsoletes
- BuildRequires pkgconfig(xext) not pkgconfig(xv)
- Update description to be a bit more confident
- Dump make check errors into the build log
* Wed Oct 05 2016 Nicolas Chauvet <kwizart@gmail.com> - 0.2.999-2.git14f6283
- Add the correct License: MIT