rpms/xorg-x11-drv-nvidia/F-16 xorg-x11-drv-nvidia.spec,1.86,1.87
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10549
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
sync with F-17
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- xorg-x11-drv-nvidia.spec 21 Nov 2012 23:21:50 -0000 1.86
+++ xorg-x11-drv-nvidia.spec 25 Nov 2012 13:12:23 -0000 1.87
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 304.64
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -261,6 +261,11 @@
install -pm 0644 %{SOURCE99} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
}
+#Workaround for self made xorg.conf using a Files section.
+%if 0%{?fedora} < 18
+ln -fs ../../nvidia/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/nvidia-%{version}
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -336,6 +341,9 @@
%dir %{nvidiaxorgdir}
%{nvidiaxorgdir}/*.so*
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%if 0%{?fedora} < 18
+%{_libdir}/xorg/modules/nvidia-%{version}
+%endif
#/no_multilib
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
@@ -369,6 +377,9 @@
%changelog
+* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-3
+- Add workaround for incorrect Files section - rfbz#2580
+
* Thu Nov 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-1
- Update to 304.64
- Move nvidia xorg libraries to _libdir/nvidia/xorg - rfbz#2264