rpm/xorg-x11-server
SHA256
1
0
Fork 0
forked from pool/xorg-x11-server
Code Pull Requests Activity

Accepting request 198196 from X11:XOrg

Browse Source 
- removed modprobe options for NVIDIA kernel module, since these
  have been moved to the NVIDIA packages themselves

OBS-URL: https://build.opensuse.org/request/show/198196
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=266
This commit is contained in:
Stephan Kulow 2013-09-11 11:25:10 +00:00 committed by Git OBS Bridge
commit 7a443781c3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modprobe.nvidia
View File

@ -1 +0,0 @@
options nvidia NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=33 NVreg_DeviceFileMode=0660

6
xorg-x11-server.changes
View File

@ -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 Fri Aug 9 15:08:34 UTC 2013 - eich@suse.com

5
xorg-x11-server.spec
View File

@ -27,7 +27,6 @@ Source0: http://xorg.freedesktop.org/archive/individual/xserver/xorg-serv
Source1: sysconfig.displaymanager.template Source1: sysconfig.displaymanager.template
Source3: README.updates Source3: README.updates
Source4: xorgcfg.tar.bz2 Source4: xorgcfg.tar.bz2
Source5: modprobe.nvidia
Source8: xorg-backtrace Source8: xorg-backtrace
# RPM Macros to be installed. The ABI Versions will be injected by configure. # RPM Macros to be installed. The ABI Versions will be injected by configure.
Source96: xorg-x11-server.macros.in Source96: xorg-x11-server.macros.in
@ -314,8 +313,6 @@ cp %{buildroot}/%{_datadir}/X11/xorg.conf.d/10-evdev.conf %{buildroot}%{_sysconf
%endif %endif
mkdir -p %{buildroot}%{_libdir}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions} 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 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 %else
rm -f %{buildroot}%{_datadir}/aclocal/*.m4 rm -f %{buildroot}%{_datadir}/aclocal/*.m4
%endif %endif
@ -377,7 +374,6 @@ exit 0
%dir %{_datadir}/X11/xorg.conf.d %dir %{_datadir}/X11/xorg.conf.d
%{_datadir}/X11/xorg.conf.d/10-evdev.conf %{_datadir}/X11/xorg.conf.d/10-evdev.conf
%endif %endif
%dir %{_sysconfdir}/modprobe.d
%dir %{_localstatedir}/lib/X11 %dir %{_localstatedir}/lib/X11
%endif %endif
%dir %{_localstatedir}/lib/xkb %dir %{_localstatedir}/lib/xkb
@ -390,7 +386,6 @@ exit 0
%exclude %{_mandir}/man1/Xnest.1* %exclude %{_mandir}/man1/Xnest.1*
%{_localstatedir}/lib/xkb/compiled/README.compiled %{_localstatedir}/lib/xkb/compiled/README.compiled
%ifnarch s390 s390x %ifnarch s390 s390x
%{_sysconfdir}/modprobe.d/50-nvidia.conf
%{_bindir}/Xorg %{_bindir}/Xorg
%{_bindir}/X %{_bindir}/X
%{_bindir}/cvt %{_bindir}/cvt