diff --git a/libglvnd.spec b/libglvnd.spec index 0ffa582..2486f6d 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -1,32 +1,28 @@ -%global commit0 4d977ea3896c2b57c13df1b02120c57a5b750c6a +%global commit0 8277115b22757c288d990574065c433e4505015a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: libglvnd -Version: 0.0.0 -Release: 8%{?commit0:.git%{shortcommit0}%{?dist} +Version: 0.1.0 +Release: 1%{?commit0:.git%{shortcommit0}}%{?dist} Summary: The GL Vendor-Neutral Dispatch library License: MIT and BSD and LGPLv2+ URL: https://github.com/NVIDIA/libglvnd -# git clone && ./autogen.sh && make dist && mv Source0: https://github.com/NVIDIA/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz -# https://github.com/NVIDIA/libglvnd/pull/48 -Patch0: 0001-Don-t-hardcode-the-minimal-xorg-version.patch -# https://github.com/NVIDIA/libglvnd/pull/66 -Patch1: 0002-Enable-x11glvnd-by-default-on-more-recent-xorg-relea.patch - #This library only target few architectures use case ExclusiveArch: x86_64 i686 armv7hl BuildRequires: libtool -BuildRequires: xorg-x11-server-Xvfb BuildRequires: libxml2-python -BuildRequires: pkgconfig(xorg-server) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xv) +# Introduced in f23 +Provides: xorg-x11-glvnd = 0.0.0-8 +Obsoletes: xorg-x11-glvnd < 0.1.0 + %{!?_with_mesa_glvnd_default: %global __provides_exclude ^(libGL.\\.so.*|libGLES*\\.so.*)$ %global __requires_exclude ^(libGL.\\.so.*|libGLES*\\.so.*)$ @@ -49,19 +45,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package -n xorg-x11-glvnd -Summary: Xorg X11 %{name} library -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description -n xorg-x11-glvnd -The xorg-x11-glvnd package contains xorg module for the GL Vendor Neutral -Dispatch library. - %prep %setup -q -n %{name}-%{?commit0}%{?!commit0:%{version}} -%patch0 -p1 -%patch1 -p1 autoreconf -vif @@ -93,7 +79,7 @@ rm -rf %{buildroot}%{_libdir}/libGLESv1_CM* %check # One test still fails in mock # FAIL: testglxqueryversion.sh -xvfb-run make check V=1 || : +make check V=1 %post -p /sbin/ldconfig @@ -116,11 +102,14 @@ xvfb-run make check V=1 || : %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%files -n xorg-x11-glvnd -%{_libdir}/xorg/modules/extensions/*.so* - %changelog +* Wed May 04 2016 Nicolas Chauvet - 0.1.0-1.git8277115 +- Update to lastest snapshot + +* Thu Feb 18 2016 Nicolas Chauvet - 0.0.0-9.git4d977ea +- Remove patch to enable by default + * Wed Feb 17 2016 Nicolas Chauvet - 0.0.0-8git20160217 - Update to git20160217 - Introduce --with mesa-libglvnd-default build conditional