Fix freshRPMs upgrade path, revert libs change (fglrx)

xorg-x11-drv-nvidia.spec

@@ -8,7 +8,7 @@
 
 Name:            xorg-x11-drv-nvidia
 Version:         177.80
-Release:       3%{?dist}
+Release:         5%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -57,6 +57,9 @@ Conflicts:     xorg-x11-drv-nvidia-96xx
 Conflicts:       xorg-x11-drv-fglrx
 Obsoletes:       nvidia-kmod < %{version}
 
+Obsoletes:       nvidia-x11-drv < %{version}-%{release}
+Provides:        nvidia-x11-drv = %{version}-%{release}
+
 %description
 This package provides the most recent NVIDIA display driver which allows for
 hardware accelerated rendering with NVIDIA chipsets NV40 (GeForce6 series) and newer.
@@ -78,9 +81,12 @@ such as OpenGL headers.
 %package libs
 Summary:         Libraries for %{name}
 Group:           User Interface/X Hardware Support
+Requires:        %{name} = %{version}-%{release}
 %ifarch %{ix86}
 Provides:        %{name}-libs-32bit = %{version}-%{release}
 Obsoletes:       %{name}-libs-32bit <= %{version}-%{release}
+Obsoletes:       nvidia-x11-drv-32bit < %{version}-%{release}
+Provides:        nvidia-x11-drv-32bit = %{version}-%{release}
 %endif
 
 %description libs
@@ -309,6 +315,12 @@ fi
 
 
 %changelog
+* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-5
+- Fix upgrade path for FreshRPMs users
+
+* Mon Oct 27 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-4
+- Revert the libs dep change
+
 * Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-3
 - Remove the libs subpackage's dependency on main package
 - Update dependency on livna-config-display