rpms/xorg-x11-drv-nvidia-304xx/F-19 99-nvidia.conf, NONE, 1.1 xorg-x11-drv-nvidia-304xx.spec, 1.13, 1.14 00-nvidia.conf, 1.1, NONE

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16023

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 at googlemail.com> - 304.116-2
- 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/F-19/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-nvidia-304xx.spec	8 Dec 2013 12:37:31 -0000	1.13
+++ xorg-x11-drv-nvidia-304xx.spec	27 Dec 2013 13:58:39 -0000	1.14
@@ -7,7 +7,7 @@
 
 Name:            xorg-x11-drv-nvidia-304xx
 Version:         304.116
-Release:         1%{?dist}
+Release:         2%{?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-%{version}.run
 Source1:         ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
-Source2:         00-nvidia.conf
+Source2:         99-nvidia.conf
 Source3:         nvidia-xorg.conf
 Source5:         00-avoid-glamor.conf
 Source6:         blacklist-nouveau.conf
@@ -228,9 +228,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
@@ -340,7 +340,7 @@
 %dir %{_sysconfdir}/OpenCL
 %dir %{_sysconfdir}/OpenCL/vendors
 %config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
-%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
@@ -391,6 +391,9 @@
 
 
 %changelog
+* Fri Dec 27 2013 Leigh Scott <leigh123linux at googlemail.com> - 304.116-2
+- fix module path issue with alien msttcore-fonts package
+
 * Sun Dec 08 2013 Leigh Scott <leigh123linux at googlemail.com> - 304.116-1
 - Update to 304.116
 


--- 00-nvidia.conf DELETED ---