rpms/xorg-x11-drv-catalyst/F-14 .cvsignore, 1.5, 1.6 sources, 1.4, 1.5 xorg-x11-drv-catalyst.spec, 1.4, 1.5

[Stewart Adam]

Author: firewing

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

Modified Files:
	.cvsignore sources xorg-x11-drv-catalyst.spec 
Log Message:
* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11-4-1
- Update to Catalyst 11.4 (internal version 8.84.1)



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Feb 2011 22:48:46 -0000	1.5
+++ .cvsignore	2 May 2011 07:45:27 -0000	1.6
@@ -1,2 +1 @@
-ati-driver-installer-11-2-x86.x86_64.run
-ati-driver-installer-11-2-x86.x86_64.run
+ati-driver-installer-11-4-x86.x86_64.run


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Feb 2011 22:48:46 -0000	1.4
+++ sources	2 May 2011 07:45:27 -0000	1.5
@@ -1,2 +1 @@
-4db782c2a7924b965918275c39157a28  ati-driver-installer-11-2-x86.x86_64.run
-4db782c2a7924b965918275c39157a28  ati-driver-installer-11-2-x86.x86_64.run
+b50dc05ef3428a9ee632b09eebeb4586  ati-driver-installer-11-4-x86.x86_64.run


Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-catalyst.spec	19 Feb 2011 22:48:46 -0000	1.4
+++ xorg-x11-drv-catalyst.spec	2 May 2011 07:45:27 -0000	1.5
@@ -7,13 +7,13 @@
 %endif
 
 Name:            xorg-x11-drv-catalyst
-Version:         11.2
+Version:         11.4
 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-11-2-x86.x86_64.run
+Source0:         https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-11-4-x86.x86_64.run
 Source1:         catalyst-README.Fedora
 Source3:         catalyst-config-display
 Source4:         catalyst-init
@@ -210,11 +210,12 @@
 
 # if we want versioned libs, then we need to change this and the loop above
 # to install the libs as soname.so.%{version}
-ln -s libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/libGL.so.1
+ln -s fglrx-libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/fglrx-libGL.so.1
 ln -s libfglrx_gamma.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_gamma.so.1
 ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_dm.so.1
 ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libAMDXvBA.so.1
 ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libXvBAW.so.1
+ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libatiuki.so.1
 
 # profile.d files
 install -D -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/catalyst.sh
@@ -276,7 +277,7 @@
   /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
+    # remove rdblacklist from boot params 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
@@ -319,6 +320,7 @@
 %defattr(-,root,root,-)
 %dir %{atilibdir}
 %{atilibdir}/*.so*
+%{atilibdir}/fglrx/*libGL*.so*
 %{atilibdir}/libAMDXvBA.cap
 %{_libdir}/dri/
 
@@ -326,10 +328,13 @@
 %defattr(-,root,root,-)
 %doc fglrxpkg/usr/src/ati/fglrx_sample_source.tgz
 %{atilibdir}/*.a
-%{_libdir}/xorg/modules/*.a
+#%{_libdir}/xorg/modules/*.a
 %{_includedir}/fglrx/
 
 %changelog
+* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11-4-1
+- Update to Catalyst 11.4 (internal version 8.84.1)
+
 * Sat Feb 19 2011 Stewart Adam <s.adam at diffingo.com> - 11.2-1
 - Update to Catalyst 11.2 (internal version 8.82.1)