rpms/xorg-x11-drv-fglrx/devel .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 xorg-x11-drv-fglrx.spec, 1.9, 1.10

[Stewart Adam]

Author: firewing

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

Modified Files:
	.cvsignore sources xorg-x11-drv-fglrx.spec 
Log Message:
Update to 8.12



Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Nov 2008 17:24:44 -0000	1.3
+++ .cvsignore	10 Dec 2008 18:28:13 -0000	1.4
@@ -1 +1 @@
-ati-driver-installer-8-11-x86.x86_64.run
+2a62d8c5173f091379e458371782a580  ati-driver-installer-8-12-x86.x86_64.run


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2008 17:24:44 -0000	1.4
+++ sources	10 Dec 2008 18:28:13 -0000	1.5
@@ -1 +1 @@
-9774452430dae8fd8b27eb6379da2e16  ati-driver-installer-8-11-x86.x86_64.run
+2a62d8c5173f091379e458371782a580  ati-driver-installer-8-12-x86.x86_64.run


Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/devel/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-fglrx.spec	17 Nov 2008 17:24:44 -0000	1.9
+++ xorg-x11-drv-fglrx.spec	10 Dec 2008 18:28:13 -0000	1.10
@@ -1,5 +1,5 @@
 %define          atilibdir       %{_libdir}/fglrx
-%define          ativersion  8.11
+%define          ativersion  8.12
 
 # Tweak to have debuginfo - part 1/2
 %if 0%{?fedora} > 7
@@ -8,13 +8,13 @@
 %endif
 
 Name:            xorg-x11-drv-fglrx
-Version:         8.552
+Version:         8.561
 Release:         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-11-x86.x86_64.run
+Source0:         https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-8-12-x86.x86_64.run
 Source1:         fglrx-README.Fedora
 Source3:         fglrx-config-display
 Source4:         fglrx-init
@@ -48,6 +48,9 @@
 Conflicts:       xorg-x11-drv-nvidia
 Conflicts:       xorg-x11-drv-nvidia-legacy
 Conflicts:       xorg-x11-drv-nvidia-96xx
+Conflicts:       xorg-x11-drv-nvidia-173xx
+Conflicts:       xorg-x11-drv-nvidia-beta
+Conflicts:       xorg-x11-drv-nvidia-newest
 Obsoletes:       fglrx-kmod < %{version}
 
 # ATI auto-generated RPMs
@@ -153,6 +156,9 @@
   elif [[ ! "/${file##./usr/X11R6/include/X11/extensions}" = "/${file}" ]]
   then
     install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_includedir}/X11/extensions/${file##./usr/X11R6/include/X11/extensions}
+  elif [[ ! "/${file##./usr/%{_lib}}" = "/${file}" ]]
+  then
+    install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/}
   elif [[ ! "/${file##./usr/X11R6/%{_lib}/}" = "/${file}" ]]
   then
     install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/}
@@ -296,6 +302,10 @@
 %{_includedir}/X11/extensions/*.h
 
 %changelog
+* Wed Dec 10 2008 Stewart Adam <s.adam at diffingo.com> - 8.561-1.8.12
+- Update to 8.12
+- Add Conflicts: for new nvidia packages
+
 * Mon Nov 17 2008 Stewart Adam <s.adam at diffingo.com> - 8.552-1.8.11
 - Update to 8.11