rpms/xorg-x11-drv-fglrx/F-8 xorg-x11-drv-fglrx.spec,1.5,1.6

[Stewart Adam]

Author: firewing

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

Modified Files:
	xorg-x11-drv-fglrx.spec 
Log Message:
freshRPMs upgrade path


Index: xorg-x11-drv-fglrx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-fglrx/F-8/xorg-x11-drv-fglrx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-fglrx.spec	25 Oct 2008 17:00:05 -0000	1.5
+++ xorg-x11-drv-fglrx.spec	4 Nov 2008 17:05:22 -0000	1.6
@@ -9,7 +9,7 @@
 
 Name:            xorg-x11-drv-fglrx
 Version:         8.542
-Release:         4.%{ativersion}%{?dist}
+Release:         5.%{ativersion}%{?dist}
 Summary:         AMD's proprietary driver for ATI graphic cards
 Group:           User Interface/X Hardware Support
 License:         BSD/Commercial/GPL/QPL
@@ -57,6 +57,9 @@
 Conflicts:       kernel-module-ATI-fglrx
 Conflicts:       ATI-fglrx-IA32-libs
 
+Obsoletes:	ati-x11-drv < %{version}-%{release}
+Provides:	ati-x11-drv = %{version}-%{release}
+
 %description
 This package provides the most recent proprietary AMD display driver which
 allows for hardware accelerated rendering with ATI Mobility, FireGL and
@@ -73,6 +76,9 @@
 Requires:        %{name}-libs = %{version}-%{release}
 Requires:        %{_includedir}/X11/extensions, %{_includedir}/GL
 
+Obsoletes:      ati-x11-drv-devel < %{version}-%{release}
+Provides:       ati-x11-drv-devel = %{version}-%{release}
+
 %description devel
 This package provides the development files of the %{name} package,
 such as OpenGL headers.
@@ -295,12 +301,16 @@
 %{_includedir}/X11/extensions/*.h
 
 %changelog
-* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-4.8.10
+* Mon Nov 3 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-5.8.10
+- Fix upgrade path for FreshRPMs users
+- Fix changelog versions
+
+* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-4.8.10
 - Remove the libs subpackage's dependency on main package
 - Don't place Xorg modules in -libs
 - Let RPM detect dependency on libstdc
 
-* Sat Oct 18 2008 Stewart Adam <s.adam at diffingo.com> - 8.543-3.8.10
+* Sat Oct 18 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-3.8.10
 - Change dependency of main package to libs subpackage in devel subpackage to
   fix multiarch repo push