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

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	.cvsignore sources xorg-x11-drv-catalyst.spec 
Log Message:
* Sun Jun 24 2012 leigh scott <leigh123linux at googlemail.com> - 12.6-0.1
- Update to Catalyst 12.6 beta (internal version 8.98)



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-17/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Nov 2011 22:47:05 -0000	1.5
+++ .cvsignore	24 Jun 2012 13:26:37 -0000	1.6
@@ -1,2 +1 @@
-xvba-sdk-0.74-404001.tar.gz
-ati-driver-installer-11-11-x86.x86_64.run
+amd-driver-installer-8.98-x86.x86_64.run


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-17/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Nov 2011 22:47:05 -0000	1.4
+++ sources	24 Jun 2012 13:26:38 -0000	1.5
@@ -1,2 +1 @@
-b8f56bc55aa70cb19dd12857fdc184cc  xvba-sdk-0.74-404001.tar.gz
-7196077aacfbaf7234a705f5352a1111  ati-driver-installer-11-11-x86.x86_64.run
+ee4558402d4cbc4e56f2549d0e8fbd0e  amd-driver-installer-8.98-x86.x86_64.run


Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-17/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-catalyst.spec	16 Nov 2011 23:27:03 -0000	1.5
+++ xorg-x11-drv-catalyst.spec	24 Jun 2012 13:26:39 -0000	1.6
@@ -4,13 +4,16 @@
 
 %global	   __strip /bin/true
 Name:            xorg-x11-drv-catalyst
-Version:         11.11
-Release:         3%{?dist}
+Version:         12.6
+Release:         0.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-11-x86.x86_64.run
+#Source0:         https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/amd-driver-installer-12-4-x86.x86_64.run
+#http://www2.ati.com/drivers/hotfix/catalyst_12.6_hotfixes/amd-driver-installer-8.98-x86.x86_64.zip
+# unzip amd-driver-installer-8.98-x86.x86_64.zip
+Source0:         amd-driver-installer-8.98-x86.x86_64.run
 Source1:         http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
 Source2:         catalyst-README.Fedora
 Source3:         amdcccle.desktop
@@ -228,6 +231,10 @@
 rm -f $RPM_BUILD_ROOT%{atilibdir}/switchlibGL
 rm -f $RPM_BUILD_ROOT%{atilibdir}/switchlibglx
 
+# ATI says this is a 64-bit binary, but it's not.
+rm -rf $RPM_BUILD_ROOT%{atilibdir}/libSlotMaximizerBe.so
+
+
 # Remove some 'fglrx-' prefixes
 mv $RPM_BUILD_ROOT%{atilibdir}/{fglrx-,}libGL.so.1.2
 mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/catalyst/{fglrx-,}libglx.so
@@ -339,6 +346,7 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su
 %config %{_sysconfdir}/X11/xorg.conf.d/*catalyst*.conf
 %{_sysconfdir}/ati/atiogl.xml
+%{_sysconfdir}/ati/atiapfxx.blb
 %{_sysconfdir}/ati/logo.xbm.example
 %{_sysconfdir}/ati/logo_mask.xbm.example
 %{_sysconfdir}/ati/amdpcsdb.default
@@ -390,6 +398,18 @@
 
 
 %changelog
+* Sun Jun 24 2012 leigh scott <leigh123linux at googlemail.com> - 12.6-0.1
+- Update to Catalyst 12.6 beta (internal version 8.98)
+
+* Fri Apr 27 2012 leigh scott <leigh123linux at googlemail.com> - 12.4-1
+- Update to Catalyst 12.4 (internal version 8.961)
+
+* Fri Mar 30 2012 leigh scott <leigh123linux at googlemail.com> - 12.3-1
+- Update to Catalyst 12.3 (internal version 8.951)
+
+* Sun Feb 05 2012 Stewart Adam <s.adam at diffingo.com> - 12.1-1
+- Update to Catalyst 12.1 (internal version 8.93)
+
 * Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-3
 - Bump because of rawhide tagging issue