rpms/xorg-x11-drv-nvidia-304xx/devel 99-nvidia.conf, NONE, 1.1 xorg-x11-drv-nvidia-304xx.spec, 1.8, 1.9 00-nvidia.conf, 1.1, NONE
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4156
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Added Files:
99-nvidia.conf
Removed Files:
00-nvidia.conf
Log Message:
* Fri Dec 27 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-3
- fix module path issue with alien msttcore-fonts package
--- NEW FILE 99-nvidia.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit
Section "Files"
ModulePath "@LIBDIR@/nvidia/xorg"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file:
/cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-nvidia-304xx.spec 16 Dec 2013 23:19:00 -0000 1.8
+++ xorg-x11-drv-nvidia-304xx.spec 27 Dec 2013 08:59:45 -0000 1.9
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.117
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic
cards
Group: User Interface/X Hardware Support
@@ -15,7 +15,7 @@
URL: http://www.nvidia.com/
Source0:
ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1:
ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source2: 00-nvidia.conf
+Source2: 99-nvidia.conf
Source3: nvidia-xorg.conf
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
@@ -232,9 +232,9 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-sed -i -e 's|@LIBDIR@|%{_libdir}|g'
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
-sed -i -e 's|nvidia|%{_nvidia_serie}|g'
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
-touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+sed -i -e 's|@LIBDIR@|%{_libdir}|g'
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+sed -i -e 's|nvidia|%{_nvidia_serie}|g'
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
# Desktop entry for nvidia-settings
@@ -348,7 +348,7 @@
%dir %{_sysconfdir}/OpenCL/vendors
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
%dir %{_sysconfdir}/nvidia
-%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
@@ -397,6 +397,9 @@
%changelog
+* Fri Dec 27 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-3
+- fix module path issue with alien msttcore-fonts package
+
* Mon Dec 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.117-2
- Use nvidia symlink for the glx.so
--- 00-nvidia.conf DELETED ---