From bb49904e86b11ef0b775760d1b875044ed6ada7a Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 4 Apr 2017 14:01:25 +0200 Subject: [PATCH] Update RPM filters for private libraries --- libglvnd.spec | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/libglvnd.spec b/libglvnd.spec index c372478..1f392d0 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -8,7 +8,7 @@ Name: libglvnd Version: 0.2.999 -Release: 12%{?commit0:.%{date}git%{shortcommit0}}%{?dist} +Release: 13%{?commit0:.%{date}git%{shortcommit0}}%{?dist} # Provide an upgrade path from the negativo17.org pkgs which have Epoch 1 Epoch: 1 Summary: The GL Vendor-Neutral Dispatch library @@ -38,8 +38,20 @@ BuildRequires: autoconf268 %endif %{?_without_mesa_glvnd_default: -%global __provides_exclude ^(libGL\\.so.*|libEGL\\.so.*|libGLES*\\.so.*)$ -%global __requires_exclude ^(libGL\\.so.*|libEGL\\.so.*|libGLES*\\.so.*)$ +%if 0%{?rhel} == 6 + +%{?filter_setup: +%filter_provides_in %{_libdir}/%{name} +%filter_requires_in %{_libdir}/%{name} +%filter_setup +} + +%else + +%global __provides_exclude_from %{_libdir}/%{name} +%global __requires_exclude_from %{_libdir}/%{name} + +%endif } %description @@ -232,6 +244,9 @@ xvfb-run -a make check V=1 || cat `find . -name test-suite.log` %changelog +* Tue Apr 04 2017 Simone Caronni - 1:0.2.999-13.20170308git8e6e102 +- Update RPM filters for private libraries (includes GLX, fixes RHEL 6). + * Mon Apr 03 2017 Simone Caronni - 1:0.2.999-12.20170308git8e6e102 - Update to latest snapshot, remove upstreamed patches. - Update release to packaging guidelines format.