rpms/xorg-x11-drv-fglrx/F-9 .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 xorg-x11-drv-fglrx.spec, 1.1, 1.2

[Stewart Adam]

Author: firewing

Update of /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30700/F-9

Modified Files:
	.cvsignore sources xorg-x11-drv-fglrx.spec 
Log Message:
Update to 8.543 beta (Catalyst 8.11 beta)





Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Oct 2008 16:20:01 -0000	1.2
+++ sources	16 Oct 2008 18:14:58 -0000	1.3
@@ -1 +1 @@
-9d1870c13bc9d7e5dccfcc62376828ff28471f0a  ati-driver-installer-8-10-x86.x86_64.run
+6abc8e86f1a00168ba8f43d58f71cb69  fglrx-installer_8.543.orig.tar.gz


Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-drv-fglrx.spec	16 Oct 2008 16:20:01 -0000	1.1
+++ xorg-x11-drv-fglrx.spec	16 Oct 2008 18:14:58 -0000	1.2
@@ -1,5 +1,5 @@
 %define          atilibdir       %{_libdir}/fglrx
-%define          ativersion  8.10
+%define          ativersion  8.11beta
 
 # Tweak to have debuginfo - part 1/2
 %if 0%{?fedora} > 7
@@ -8,13 +8,14 @@
 %endif
 
 Name:            xorg-x11-drv-fglrx
-Version:         8.542
-Release:         1.%{ativersion}%{?dist}
+Version:         8.543
+Release:         0.1.%{ativersion}%{?dist}
 Summary:         AMD's proprietary driver for ATI graphic cards
 Group:           User Interface/X Hardware Support
 License:         BSD/Commercial/GPL/QPL
 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-8-10-x86.x86_64.run
+#Source0:         https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-8-10-x86.x86_64.run
+Source0:         http://archive.ubuntu.com/ubuntu/pool/multiverse/f/fglrx-installer/fglrx-installer_8.543.orig.tar.gz
 Source1:         fglrx-README.Fedora
 Source3:         fglrx-config-display
 Source4:         fglrx-init
@@ -98,7 +99,13 @@
 
 %prep
 %setup -q -c -T
-sh %{SOURCE0} --extract fglrx
+#sh %{SOURCE0} --extract fglrx
+mkdir -p fglrx/common
+pushd fglrx
+tar xfz %{SOURCE0}
+mv etc lib opt usr common
+cp common/usr/share/doc/fglrx/ATI_LICENSE.TXT .
+popd
 
 tar -cjf fglrx-kmod-data-%{version}.tar.bz2 fglrx/ATI_LICENSE.TXT fglrx/common/*/modules/fglrx/ fglrx/arch/*/*/modules/fglrx/
 
@@ -110,11 +117,13 @@
 
 mkdir fglrxpkg
 %ifarch %{ix86}
-cp -r fglrx/common/* fglrx/x710/* fglrx/arch/x86/* fglrxpkg/
+#cp -r fglrx/common/* fglrx/x710/* fglrx/arch/x86/* fglrxpkg/
+cp -r fglrx/common/* fglrx/x740/* fglrx/arch/x86/* fglrxpkg/
 %endif
 
 %ifarch x86_64
-cp -r fglrx/common/* fglrx/x710_64a/* fglrx/arch/x86_64/* fglrxpkg/
+#cp -r fglrx/common/* fglrx/x710_64a/* fglrx/arch/x86_64/* fglrxpkg/
+cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/
 %endif
 
 # fix doc perms
@@ -297,6 +306,9 @@
 %{_includedir}/X11/extensions/*.h
 
 %changelog
+* Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-0.1.8.11beta
+- Update to 8.11 beta (8.54.3)
+
 * Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com>	- 8.542-1.8.10
 - Update to 8.10