Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6700/F-17
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 304.88
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore 21 Nov 2012 23:21:50 -0000 1.48
+++ .cvsignore 4 Apr 2013 21:17:05 -0000 1.49
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-304.64.run
-NVIDIA-Linux-x86_64-304.64.run
+NVIDIA-Linux-x86-304.88.run
+NVIDIA-Linux-x86_64-304.88.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources 21 Nov 2012 23:21:50 -0000 1.53
+++ sources 4 Apr 2013 21:17:05 -0000 1.54
@@ -1,2 +1,2 @@
-6964415cf648a5f4f38117b168369de2 NVIDIA-Linux-x86-304.64.run
-a2d14786929d832ca9cf650cbad40c24 NVIDIA-Linux-x86_64-304.64.run
+f60d4aef766029c98914ed665235029a NVIDIA-Linux-x86-304.88.run
+a6d8010c5e4f0d65615a196326a3219c NVIDIA-Linux-x86_64-304.88.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- xorg-x11-drv-nvidia.spec 25 Nov 2012 12:08:06 -0000 1.89
+++ xorg-x11-drv-nvidia.spec 4 Apr 2013 21:17:05 -0000 1.90
@@ -7,8 +7,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 304.64
-Release: 3%{?dist}
+Version: 304.88
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -174,8 +174,8 @@
echo "%{nvidialibdir}" >
$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
#Blacklist nouveau (since F-11)
-install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
-install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
# Install initscript
#install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
@@ -305,7 +305,8 @@
for kernel in ${KERNELS} ; do
/sbin/grubby $ISGRUB1 \
--update-kernel=${kernel} \
- --remove-args='nouveau.modeset=0 rdblacklist=nouveau
rd.driver.blacklist=nouveau nomodeset video=vesa:off' &>/dev/null
+ --remove-args='nouveau.modeset=0 rdblacklist=nouveau
rd.driver.blacklist=nouveau nomodeset video=vesa:off vga=normal' \
+ &>/dev/null
done
fi
#Backup and disable previously used xorg.conf
@@ -329,7 +330,7 @@
%config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
}
%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
-%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
+%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
#{_initrddir}/nvidia
%{_bindir}/nvidia-bug-report.sh
@@ -377,6 +378,15 @@
%changelog
+* Thu Apr 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.88-1
+- Update to 304.88
+
+* Fri Jan 18 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.64-5
+- move blacklist to %%{_prefix}/lib/modprobe.d/
+
+* Thu Jan 10 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:304.64-4
+- Fix preun scriptlet
+
* Sun Nov 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.64-3
- Add workaround for incorrect Files section - rfbz#2580