From a3c9eed7294ad5c45c87dada03a1029998cf43f956d839cff4c61de2d99e8310 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 10 Sep 2013 09:35:32 +0000
Subject: [PATCH] - removed modprobe options for NVIDIA kernel module, since
 these   have been moved to the NVIDIA packages themselves

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=457
---
 modprobe.nvidia         | 1 -
 xorg-x11-server.changes | 6 ++++++
 xorg-x11-server.spec    | 5 -----
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 modprobe.nvidia

diff --git a/modprobe.nvidia b/modprobe.nvidia
deleted file mode 100644
index fef1146..0000000
--- a/modprobe.nvidia
+++ /dev/null
@@ -1 +0,0 @@
-options nvidia NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=33 NVreg_DeviceFileMode=0660
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 0dc2622..2baa0fc 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 10 09:23:38 UTC 2013 - sndirsch@suse.com
+
+- removed modprobe options for NVIDIA kernel module, since these
+  have been moved to the NVIDIA packages themselves
+
 -------------------------------------------------------------------
 Fri Aug  9 15:08:34 UTC 2013 - eich@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 17fbfdf..7cb723f 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -27,7 +27,6 @@ Source0:        http://xorg.freedesktop.org/archive/individual/xserver/xorg-serv
 Source1:        sysconfig.displaymanager.template
 Source3:        README.updates
 Source4:        xorgcfg.tar.bz2
-Source5:        modprobe.nvidia
 Source8:        xorg-backtrace
 # RPM Macros to be installed. The ABI Versions will be injected by configure.
 Source96:       xorg-x11-server.macros.in
@@ -314,8 +313,6 @@ cp %{buildroot}/%{_datadir}/X11/xorg.conf.d/10-evdev.conf %{buildroot}%{_sysconf
 %endif
 mkdir -p %{buildroot}%{_libdir}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions}
 install -m 644 $RPM_SOURCE_DIR/README.updates %{buildroot}%{_libdir}/xorg/modules/updates
-mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
-install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia %{buildroot}%{_sysconfdir}/modprobe.d/50-nvidia.conf
 %else
 rm -f %{buildroot}%{_datadir}/aclocal/*.m4
 %endif
@@ -377,7 +374,6 @@ exit 0
 %dir %{_datadir}/X11/xorg.conf.d
 %{_datadir}/X11/xorg.conf.d/10-evdev.conf
 %endif
-%dir %{_sysconfdir}/modprobe.d
 %dir %{_localstatedir}/lib/X11
 %endif
 %dir %{_localstatedir}/lib/xkb
@@ -390,7 +386,6 @@ exit 0
 %exclude %{_mandir}/man1/Xnest.1*
 %{_localstatedir}/lib/xkb/compiled/README.compiled
 %ifnarch s390 s390x
-%{_sysconfdir}/modprobe.d/50-nvidia.conf
 %{_bindir}/Xorg
 %{_bindir}/X
 %{_bindir}/cvt