rpms/xorg-x11-drv-fglrx/F-9 .cvsignore, 1.3, 1.4 amdcccle.desktop, 1.1, 1.2 fglrx-README.Fedora, 1.2, 1.3 sources, 1.4, 1.5 xorg-x11-drv-fglrx.spec, 1.13, 1.14

[Stewart Adam]

Author: firewing

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

Modified Files:
	.cvsignore amdcccle.desktop fglrx-README.Fedora sources 
	xorg-x11-drv-fglrx.spec 
Log Message:
* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
- Update to Catalyst 9.1
- Include README.Fedora in %doc
- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
- Update License tag



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Dec 2008 17:43:43 -0000	1.3
+++ .cvsignore	31 Jan 2009 16:56:06 -0000	1.4
@@ -1 +1 @@
-ati-driver-installer-8-12-x86.x86_64.run
+ati-driver-installer-9-1-x86.x86_64.run


Index: amdcccle.desktop
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/amdcccle.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amdcccle.desktop	16 Oct 2008 16:20:01 -0000	1.1
+++ amdcccle.desktop	31 Jan 2009 16:56:06 -0000	1.2
@@ -14,9 +14,8 @@
 Comment[es]=Configuración del adaptador de los gráficos de ATI
 Comment[fr]=Configuration d'adapteur de graphiques d'ATI
 Comment[it]=Configurazione dell'adattatore dei grafici di ATI
-Icon=ccc_large.xpm
+Icon=ccc_large
 Exec=amdcccle
 Type=Application
 Terminal=false
-Encoding=UTF-8
 Categories=Qt;System;


Index: fglrx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/fglrx-README.Fedora,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fglrx-README.Fedora	30 Dec 2008 22:41:05 -0000	1.2
+++ fglrx-README.Fedora	31 Jan 2009 16:56:06 -0000	1.3
@@ -69,3 +69,5 @@
 from rpmfusion.org and rebuild the kernel module with the following command:
     rpmbuild --rebuild /path/to/fglrx-srpm.src.rpm
 
+
+


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Dec 2008 17:43:43 -0000	1.4
+++ sources	31 Jan 2009 16:56:06 -0000	1.5
@@ -1 +1 @@
-2a62d8c5173f091379e458371782a580  ati-driver-installer-8-12-x86.x86_64.run
+cc4ff401586a6c099c9fd002c25cf7bb  ati-driver-installer-9-1-x86.x86_64.run


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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-fglrx.spec	31 Dec 2008 18:46:58 -0000	1.13
+++ xorg-x11-drv-fglrx.spec	31 Jan 2009 16:56:06 -0000	1.14
@@ -1,5 +1,5 @@
 %define          atilibdir       %{_libdir}/fglrx
-%define          ativersion  8.12
+%define          ativersion  9.1
 
 # Tweak to have debuginfo - part 1/2
 %if 0%{?fedora} > 7
@@ -8,13 +8,13 @@
 %endif
 
 Name:            xorg-x11-drv-fglrx
-Version:         8.561
-Release:         5.%{ativersion}%{?dist}
+Version:         8.573
+Release:         1.%{ativersion}%{?dist}
 Summary:         AMD's proprietary driver for ATI graphic cards
 Group:           User Interface/X Hardware Support
-License:         BSD/Commercial/GPL/QPL
+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-8-12-x86.x86_64.run
+Source0:         https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-9-1-x86.x86_64.run
 Source1:         fglrx-README.Fedora
 Source3:         fglrx-config-display
 Source4:         fglrx-init
@@ -120,8 +120,9 @@
 cp -r fglrx/common/* fglrx/x740_64a/* fglrx/arch/x86_64/* fglrxpkg/
 %endif
 
-# fix doc perms
+# fix doc perms & copy README.Fedora
 find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \;
+install -pm 0644 %{SOURCE1} ./README.Fedora
 
 %build
 
@@ -211,8 +212,7 @@
 install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-lid-aticonfig.conf
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor livna \
-    --add-category X-Livna \
+desktop-file-install --vendor rpmfusion \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     %{SOURCE5}
 
@@ -227,12 +227,6 @@
 chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
 chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
 
-%ifarch x86_64
-# dri workaround
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/dri
-ln -s ../../lib64/dri/fglrx_dri.so $RPM_BUILD_ROOT%{_prefix}/lib/dri/
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -264,7 +258,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc fglrxpkg/usr/share/doc/fglrx/*
+%doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora
 %dir %{_sysconfdir}/ati/
 %{_sysconfdir}/ati/authatieventsd.sh
 %{_sysconfdir}/ati/signature
@@ -289,10 +283,6 @@
 %{_mandir}/man[1-9]/atieventsd.*
 %{_libdir}/xorg/modules/extensions/fglrx/
 %{_libdir}/xorg/modules/*.so
-%{_libdir}/dri/
-%ifarch x86_64
-%{_prefix}/lib/dri/
-%endif
 
 %files libs
 %defattr(-,root,root,-)
@@ -300,6 +290,7 @@
 %{atilibdir}/*.so*
 # FIXME: This file is recognized as "data" - figure out how to move it later
 %{atilibdir}/libAMDXvBA.cap
+%{_libdir}/dri/
 
 %files devel
 %defattr(-,root,root,-)
@@ -310,6 +301,12 @@
 %{_includedir}/X11/extensions/*.h
 
 %changelog
+* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
+- Update to Catalyst 9.1
+- Include README.Fedora in %%doc
+- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
+- Update License tag
+
 * Wed Dec 31 2008 Stewart Adam <s.adam at diffingo.com>	- 8.561-5.8.12
 - symlink needs to be ../lib64/dri, not ../lib64