rpms/xorg-x11-drv-catalyst-legacy/F-18 blacklist-radeon.conf, NONE, 1.1 xorg-x11-drv-catalyst-legacy.spec, 1.1, 1.2

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst-legacy/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2273

Modified Files:
	xorg-x11-drv-catalyst-legacy.spec 
Added Files:
	blacklist-radeon.conf 
Log Message:
* Mon Feb 04 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.1-2
- add blacklist file to %{_prefix}/lib/modprobe.d/



--- NEW FILE blacklist-radeon.conf ---
# 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: xorg-x11-drv-catalyst-legacy.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst-legacy/F-18/xorg-x11-drv-catalyst-legacy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-catalyst-legacy.spec	4 Feb 2013 16:07:37 -0000	1.1
+++ xorg-x11-drv-catalyst-legacy.spec	4 Feb 2013 17:14:47 -0000	1.2
@@ -5,7 +5,7 @@
 %global    __strip /bin/true
 Name:            xorg-x11-drv-catalyst-legacy
 Version:         13.1
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         AMD's proprietary driver for ATI legacy graphic cards
 Group:           User Interface/X Hardware Support
 License:         Redistributable, no modification permitted
@@ -20,6 +20,7 @@
 Source7:         catalyst-legacy-a-lid-aticonfig
 Source8:         00-catalyst-legacy-modulepath.conf
 Source9:         01-catalyst-legacy-videodriver.conf
+Source10:        blacklist-radeon.conf
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -300,6 +301,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
 echo "%{atilibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/catalyst-legacy-%{_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
 
@@ -351,6 +356,7 @@
 %doc %{_docdir}/amdcccle/ccc_copyrights.txt
 %config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su
 %config %{_sysconfdir}/X11/xorg.conf.d/*catalyst*.conf
+%{_prefix}/lib/modprobe.d/blacklist-radeon.conf
 %{_sysconfdir}/ati/atiogl.xml
 %{_sysconfdir}/ati/logo.xbm.example
 %{_sysconfdir}/ati/logo_mask.xbm.example
@@ -401,6 +407,9 @@
 
 
 %changelog
+* Mon Feb 04 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.1-2
+- add blacklist file to %%{_prefix}/lib/modprobe.d/
+
 * Mon Feb 04 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.1-1
 - Update to Catalyst legacy (internal version 13.1 8.97.100.7)