rpms/xorg-x11-drv-nvidia-96xx/F-13 xorg-x11-drv-nvidia-96xx.spec, 1.19, 1.20 nvidia-96xx-README.Fedora, 1.5, 1.6

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10473

Modified Files:
	xorg-x11-drv-nvidia-96xx.spec nvidia-96xx-README.Fedora 
Log Message:
Resync with main driver



Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-13/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-nvidia-96xx.spec	3 Nov 2010 16:02:19 -0000	1.19
+++ xorg-x11-drv-nvidia-96xx.spec	3 Nov 2010 21:45:22 -0000	1.20
@@ -8,7 +8,7 @@
 
 Name:            xorg-x11-drv-nvidia-96xx
 Version:         96.43.19
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -46,7 +46,11 @@
 BuildRequires:   prelink
 Requires:        which
 Requires:        livna-config-display
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires:        %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
 Requires:        %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
 
 Requires(post):  livna-config-display
 Requires(preun): livna-config-display
@@ -82,7 +86,11 @@
 %package devel
 Summary:         Development files for %{name}
 Group:           Development/Libraries
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires:        %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
 Requires:        %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
 
 %description devel
 This package provides the development files of the %{name} package,
@@ -216,6 +224,13 @@
 %endif
 %endif
 
+#Install static driver dependant configuration files
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE2} $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
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -232,7 +247,7 @@
     GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
     /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
   fi
-fi
+fi || :
 if [ -x /usr/sbin/setsebool ] ; then
   SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
   if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
@@ -248,6 +263,17 @@
     test -f %{_sbindir}/nvidia-96xx-config-display && %{_sbindir}/nvidia-96xx-config-display disable &>/dev/null ||:
     %{_initrddir}/nvidia-96xx stop &>/dev/null ||:
     /sbin/chkconfig --del nvidia-96xx ||:
+    #Clear grub option to disable nouveau for all kernels
+    if [ -x /sbin/grubby ] ; then
+      KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)`
+      for kernel in ${KERNELS} ; do
+      /sbin/grubby --update-kernel=${kernel} \
+        --remove-args='nouveau.modeset=0 rdblacklist=nouveau nomodeset' &>/dev/null
+      done
+    fi
+    #Backup and disable previously used xorg.conf
+    [ -f %{_sysconfdir}/X11/xorg.conf ] && \
+      mv  %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null
 fi ||:
 
 %postun libs -p /sbin/ldconfig
@@ -288,8 +314,10 @@
 
 
 %changelog
-* Wed Nov 03 2010 Nicolas Chauvet <kwizart at gmail.com> - 96.43.19-1
+* Wed Nov 03 2010 Nicolas Chauvet <kwizart at gmail.com> - 96.43.19-2
 - Update to 96.43.19
+- Explicitely use %%{_isa} dependency from -devel to -libs
+- Improve uninstallation script rfbz#1398
 
 * Sat Aug 14 2010 Nicolas Chauvet <kwizart at gmail.com> - 96.43.18-1
 - Update to 96.43.18


Index: nvidia-96xx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-13/nvidia-96xx-README.Fedora,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nvidia-96xx-README.Fedora	3 Nov 2010 16:02:19 -0000	1.5
+++ nvidia-96xx-README.Fedora	3 Nov 2010 21:45:22 -0000	1.6
@@ -1,112 +1 @@
-README for Nvidia Linux Drivers, as packaged by livna.org.
-
-1. After Installation
----------------------
-
-You only have to restart X to start using the Nvidia drivers after
-installation. Either choose "Log Out" from the GNOME/KDE menu, and then
-press Ctrl-Alt-Backspace at the login prompt, or press Ctrl-Alt-Backspace
-directly. You should see a white screen with a big Nvidia logo in the middle
-for about one second.
-
-To check that hardware acceleration is working, issue the following command
-in a terminal:
-
-        glxinfo | grep OpenGL
-
-That should print out
-
-        OpenGL vendor string: NVIDIA Corporation
-
-among a few other things. Also, the command
-
-        glxinfo | grep direct
-
-should print out
-
-        direct rendering: Yes
-
-If it does, you're all set.
-
-2. Basic Configuration
-----------------------
-
-The installation scripts perform the basic configuration for you.
-When (if) you uninstall the drivers, the configuration is reset to
-use the X.org/XFree86 Nvidia drivers again. If you want to temporarily
-disable the Nvidia drivers without uninstalling, you can issue the
-following two commands as root (remember su -):
-
-        nvidia-config-display disable
-
-To re-enable the Nvidia drivers, run:
-
-        nvidia-config-display enable
-
-
-3. Additional configuration
----------------------------
-
-It's possible to configure image quality and performance by setting various
-environment variables. Take a look at /etc/profile.d/nvidia-glx.sh
-(or .csh if you use csh) and read the README file in the same directory
-as this file.
-
-There are a number of settings in the X configuration file as well.
-The most interesting are acceleration of the XRENDER extension and AGP
-configuration. In the Driver section of /etc/X11/xorg.conf, you may add
-the following line:
-
-        Option "RenderAccel" "true"
-
-to enable XRENDER acceleration. A value of "false" disables it.
-Note: this has shown to make some systems unstable, making the display freeze.
-If you experience this, set to "false" or comment out the line.
-
-To control AGP behaviour, add the following line to the Driver section:
-
-        Option "NvAGP" "X"
-
-where X is 0, 1, 2 or 3. The different values are as follows (from Nvidia
-README):
-
-        0 : disable agp
-        1 : use NVIDIA's internal AGP support, if possible
-        2 : use AGPGART, if possible
-        3 : use any agp support (try AGPGART, then NVIDIA's AGP)
-
-Default is 3. AGPGART is the Linux kernel AGP driver. See Nvidia README,
-appendix D for more information. AGP speed is controlled by giving a parameter
-to the Nvidia kernel module, but should be autodetected in most cases.
-See output of "modinfo nvidia".
-
-For more configuration options (TwinView, TV-out etc) see the Nvidia README.
-
-4. An Initscript to enable/disable nvidia driver
-------------------------------------------------
-
-To make gdm work at system start this package contains an initscript that
-will be run during start up. This script will detect if the nvidia module
-for the running kernel is present. If the module is present, then the
-initscript will run.
-
-        "nvidia-config-display enable"
-
-so that the X server will use the nvidia driver, otherwise it will run
-
-        "nvidia-config-display disable"
-
-and X will use the nv driver. You can disable this check by running, as
-root (with root $PATH) :
-
-        chkconfig nvidia off
-
-
-This script will also be invoked when switching to runlevels 6
-(reboot) and 0 (halt). When rebooting (or shutting down) the system,
-the script will _disable_ nvidia driver (and switch back to "nv"
-driver), so that, whatever the kernel you boot, Red Hat Graphical Boot
-will work.
-
-We suggest you read the chkconfig(8) man page for complete
-informations about how to handle rc scripts.
+See http://rpmfusion.org/Howto/nVidia