rpms/libglvnd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix conditionals for _without_mesa_glvnd_default

Browse Source 
Fix other RHEL-conditionals, too
This commit is contained in:
Björn Esser 2017-04-04 14:07:07 +02:00
parent bb49904e86
commit 053be5034f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libglvnd.spec
View File

@ -2,13 +2,13 @@
%global date 20170308 %global date 20170308
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%if 0%{?rhel} <= 7 || 0%{?fedora} <= 24 %if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 7)
%global _without_mesa_glvnd_default 1 %global _without_mesa_glvnd_default 1
%endif %endif
Name: libglvnd Name: libglvnd
Version: 0.2.999 Version: 0.2.999
Release: 13%{?commit0:.%{date}git%{shortcommit0}}%{?dist} Release: 14%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
# Provide an upgrade path from the negativo17.org pkgs which have Epoch 1 # Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
Epoch: 1 Epoch: 1
Summary: The GL Vendor-Neutral Dispatch library Summary: The GL Vendor-Neutral Dispatch library
@ -33,12 +33,12 @@ BuildRequires: pkgconfig(xext)
#https://github.com/NVIDIA/libglvnd/issues/93 #https://github.com/NVIDIA/libglvnd/issues/93
BuildRequires: xorg-x11-server-Xvfb BuildRequires: xorg-x11-server-Xvfb
%if 0%{?rhel} == 6 %if (0%{?rhel} && 0%{?rhel} <= 6)
BuildRequires: autoconf268 BuildRequires: autoconf268
%endif %endif
%{?_without_mesa_glvnd_default: %{?_without_mesa_glvnd_default:
%if 0%{?rhel} == 6 %if (0%{?rhel} && 0%{?rhel} <= 6)
%{?filter_setup: %{?filter_setup:
%filter_provides_in %{_libdir}/%{name} %filter_provides_in %{_libdir}/%{name}
@ -244,6 +244,10 @@ xvfb-run -a make check V=1 || cat `find . -name test-suite.log`
%changelog %changelog
* Tue Apr 04 2017 Björn Esser <besser82@fedoraproject.org> - 1:0.2.999-14.20170308git8e6e102
- Fix conditionals for _without_mesa_glvnd_default
- Fix other RHEL-conditionals, too
* Tue Apr 04 2017 Simone Caronni <negativo17@gmail.com> - 1:0.2.999-13.20170308git8e6e102 * Tue Apr 04 2017 Simone Caronni <negativo17@gmail.com> - 1:0.2.999-13.20170308git8e6e102
- Update RPM filters for private libraries (includes GLX, fixes RHEL 6). - Update RPM filters for private libraries (includes GLX, fixes RHEL 6).