From cd53a860a581f2c47262cd582baa61cdd56cd1f3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Oct 06 2016 07:59:49 +0000 Subject: Remove x11-glvnd.conf --- diff --git a/10-x11glvnd.conf b/10-x11glvnd.conf deleted file mode 100644 index ee7b496..0000000 --- a/10-x11glvnd.conf +++ /dev/null @@ -1,6 +0,0 @@ -#This file is provided by libglvnd -#Do not edit - -Section "Module" -Load "x11glvnd" -EndSection diff --git a/libglvnd.spec b/libglvnd.spec index 017d42a..7e1db08 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -9,7 +9,6 @@ License: MIT and BSD and LGPLv2+ URL: https://github.com/NVIDIA/libglvnd # git clone && ./autogen.sh && make dist && mv Source0: libglvnd-%{version}%{?snapshot}.tar.gz -Source1: 10-x11glvnd.conf Patch0: 0001-Don-t-hardcode-the-minimal-xorg-version.patch Patch1: 0002-Enable-x11glvnd-by-default-on-more-recent-xorg-relea.patch @@ -59,11 +58,6 @@ make %{?_smp_mflags} V=1 %make_install find %{buildroot} -name '*.la' -exec rm -f {} ';' -# Install config file -mkdir -p %{buildroot}%{_datadir}/X11/xorg.conf.d -install -pm 0644 %{SOURCE1} \ - %{buildroot}%{_datadir}/X11/xorg.conf.d - # Avoid conflict with mesa-libGL for now mkdir -p %{buildroot}%{_libdir}/%{name} for l in libGL libGLESv2 ; do @@ -89,7 +83,6 @@ rm -rf %{buildroot}%{_libdir}/libGLESv1_CM* %files -n xorg-x11-glvnd %{_libdir}/xorg/modules/extensions/*.so* -%{_datadir}/X11/xorg.conf.d/10-x11glvnd.conf %changelog