Author: leigh123linux Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23723 Modified Files: .cvsignore sources xorg-x11-drv-catalyst.spec Added Files: blacklist-radeon.conf Log Message: * Wed Dec 05 2012 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 12.11-0.3.beta11 - Update to Catalyst 12.11 beta (internal version 9.01.8) - add blacklist file to %{_prefix}/lib/modprobe.d/ Index: blacklist-radeon.conf =================================================================== RCS file: blacklist-radeon.conf diff -N blacklist-radeon.conf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ blacklist-radeon.conf 5 Dec 2012 14:38:13 -0000 1.3 @@ -0,0 +1,4 @@ +# RPM Fusion blacklist for radeon driver - you need to run as root: +# dracut -f /boot/initramfs-$(uname -r).img $(uname -r) +# if radeon is loaded despite this file. +blacklist radeon Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Oct 2012 00:57:55 -0000 1.8 +++ .cvsignore 5 Dec 2012 14:38:13 -0000 1.9 @@ -3,3 +3,4 @@ amd-driver-installer-12-9-beta-x86.x86_64.zip amd-driver-installer-catalyst-12.10-x86.x86_64.zip amd-driver-installer-catalyst-12.11-beta-x86.x86_64.zip +amd-driver-installer-catalyst-12.11-beta11-x86.x86_64.zip Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Oct 2012 00:57:55 -0000 1.8 +++ sources 5 Dec 2012 14:38:13 -0000 1.9 @@ -1,2 +1,2 @@ b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz -ccc6ff5a522b680b9a40a33304e8c8e5 amd-driver-installer-catalyst-12.11-beta-x86.x86_64.zip +f9661807df829c5398aeae5f9fd5ffea amd-driver-installer-catalyst-12.11-beta11-x86.x86_64.zip Index: xorg-x11-drv-catalyst.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-18/xorg-x11-drv-catalyst.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-drv-catalyst.spec 5 Nov 2012 20:46:59 -0000 1.9 +++ xorg-x11-drv-catalyst.spec 5 Dec 2012 14:38:13 -0000 1.10 @@ -1,16 +1,16 @@ %global atilibdir %{_libdir}/catalyst -%global amdrun amd-driver-installer-catalyst-12.11-beta-x86.x86_64.run +%global amdrun amd-driver-installer-catalyst-12.11-beta11-x86.x86_64.run %global debug_package %{nil} %global __strip /bin/true Name: xorg-x11-drv-catalyst Version: 12.11 -Release: 0.2.beta%{?dist} +Release: 0.3.beta11%{?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: http://www2.ati.com/drivers/beta/amd-driver-installer-catalyst-12.11-beta... +Source0: http://www2.ati.com/drivers/beta/amd-driver-installer-catalyst-12.11-beta... Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz Source2: catalyst-README.Fedora Source3: amdcccle.desktop @@ -20,6 +20,7 @@ Source7: catalyst-a-lid-aticonfig Source8: 00-catalyst-modulepath.conf Source9: 01-catalyst-videodriver.conf +Source10: blacklist-radeon.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -293,6 +294,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d echo "%{atilibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf +#Blacklist radeon +install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ +install -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ + %clean rm -rf $RPM_BUILD_ROOT @@ -343,6 +348,7 @@ %dir %{_sysconfdir}/ati/ %doc %{_docdir}/amdcccle/ccc_copyrights.txt %config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su +%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-radeon.conf %config %{_sysconfdir}/X11/xorg.conf.d/*catalyst*.conf %{_sysconfdir}/ati/atiogl.xml %{_sysconfdir}/ati/atiapfxx.blb @@ -397,6 +403,10 @@ %changelog +* Wed Dec 05 2012 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 12.11-0.3.beta11 +- Update to Catalyst 12.11 beta (internal version 9.01.8) +- add blacklist file to %%{_prefix}/lib/modprobe.d/ + * Mon Nov 05 2012 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 12.11-0.2.beta - update blacklist scriptlets