rpms/xorg-x11-drv-catalyst/F-13 .cvsignore, 1.4, 1.5 catalyst-README.Fedora, 1.2, 1.3 sources, 1.3, 1.4 xorg-x11-drv-catalyst.spec, 1.2, 1.3

[Stewart Adam]

Author: firewing

Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5721/F-13

Modified Files:
	.cvsignore catalyst-README.Fedora sources 
	xorg-x11-drv-catalyst.spec 
Log Message:
* Mon Aug 30 2010 Stewart Adam <s.adam at diffingo.com> - 10.8-1
- Update to Catalyst 10.8 (internal version 8.76.2)
- Remove radeon.modeset=0 and rdblacklist=radeon parameters in %preun





Index: catalyst-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13/catalyst-README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- catalyst-README.Fedora	28 Jul 2010 23:42:53 -0000	1.2
+++ catalyst-README.Fedora	30 Aug 2010 16:20:46 -0000	1.3
@@ -75,8 +75,20 @@
 
 As of Catalyst version 9.10, the fglrx kernel module is no longer incompatible
 with the open-source Radeon Xorg driver. The initrd image regeneration
-workaround is therefore no longer required. However, during testing some
-systems failed to poweroff properly if kernel modesetting (KMS) was enabled. If
-you are affected by this problem, you can disable modesetting by executing the
-following command as root:
-    grubby --update-kernel=/boot/vmlinuz-`uname -r` --args=nomodeset
+workaround is therefore no longer required.
+
+However, during testing it was found that in some cases, kernel modesetting
+may need to be disabled in order for the fglrx driver to function correctly.
+Upon a fresh installation, the Catalyst driver will automatically add
+radeon.modeset=0 to the default kernel's parameters in /etc/grub.conf. If you
+are upgrading from a previous version of the Catalyst driver, you may have to
+make this change manually by running as root:
+    GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+    /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0' &>/dev/null
+
+The Catalyst driver will automatically undo this change upon installation.
+Should you want to keep kernel modesetting disabled after uninstallation, run
+the same command above after uninstalling the Catalyst drivers and then reboot.
+
+For legacy reasons, the driver will also remove rdblacklist=radeon from the
+kernel parameters upon uninstallation.


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jul 2010 23:42:53 -0000	1.3
+++ sources	30 Aug 2010 16:20:46 -0000	1.4
@@ -1 +1 @@
-0855d05f303a442aa493c8542e2993ef  ati-driver-installer-10-7-x86.x86_64.run
+9ecfa448671925ebb277831fff607689  ati-driver-installer-10-8-x86.x86_64.run


Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-13/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-catalyst.spec	28 Jul 2010 23:42:53 -0000	1.2
+++ xorg-x11-drv-catalyst.spec	30 Aug 2010 16:20:46 -0000	1.3
@@ -7,13 +7,13 @@
 %endif
 
 Name:            xorg-x11-drv-catalyst
-Version:         10.7
+Version:         10.8
 Release:         1%{?dist}
 Summary:         AMD's proprietary driver for ATI graphic cards
 Group:           User Interface/X Hardware Support
 License:         Redistributable, no modification permitted
 URL:             http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0:         https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-7-x86.x86_64.run
+Source0:         https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-8-x86.x86_64.run
 Source1:         catalyst-README.Fedora
 Source3:         catalyst-config-display
 Source4:         catalyst-init
@@ -262,7 +262,7 @@
   /etc/init.d/catalyst start &>/dev/null ||:
   if [ -x /sbin/grubby ] ; then
     GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
-    /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0 rdblacklist=radeon' &>/dev/null
+    /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0' &>/dev/null
   fi
 fi ||:
 
@@ -275,6 +275,11 @@
   /etc/init.d/catalyst stop &>/dev/null
   /sbin/chkconfig --del catalyst
   /sbin/chkconfig --del atieventsd
+  if [ -x /sbin/grubby ] ; then
+    # leave rdblacklist here in case they installed with v10.7, which blacklisted radeon upon installation
+    GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+    /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --remove-args='radeon.modeset=0 rdblacklist=radeon' &>/dev/null
+  fi
 fi ||:
 
 %postun libs -p /sbin/ldconfig
@@ -323,6 +328,10 @@
 %{_includedir}/fglrx/
 
 %changelog
+* Mon Aug 30 2010 Stewart Adam <s.adam at diffingo.com> - 10.8-1
+- Update to Catalyst 10.8 (internal version 8.76.2)
+- Remove radeon.modeset=0 and rdblacklist=radeon parameters in %%preun
+
 * Wed Jul 28 2010 Stewart Adam <s.adam at diffingo.com> - 10.7-1
 - Update to Catalyst 10.7 (internal version 8.75.3)
 - Integrate specfile changes made since 9.4 in F-12 branch