- remove _alt_kernel references from userspace (reverted uzsolt's commit)

- kernel module now provides: kernel-video-fglrx if built with _alt_kernel

Changed files:
    xorg-driver-video-fglrx.spec -> 1.224

diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index bde088051f32ed5d2e4ac9b6c3a48179a044de90..46f73cf47d8cdf124b4efc58974af8a4cdd8bbc3 100644 (file)
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -31,7 +31,7 @@
 %define                pname           xorg-driver-video-fglrx
 Summary:       Linux Drivers for ATI graphics accelerators
 Summary(pl.UTF-8):     Sterowniki do akceleratorów graficznych ATI
-Name:          %{pname}%{_alt_kernel}
+Name:          %{pname}
 Version:       11.1
 Release:       %{rel}%{?with_multigl:.mgl}
 Epoch:         1
@@ -53,12 +53,12 @@ URL:                http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires: rpmbuild(macros) >= 1.379
 BuildRequires: sed >= 4.0
-Requires:      %{pname}%{_alt_kernel}-libs = %{epoch}:%{version}-%{rel}
+Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:      xorg-xserver-server
 Requires:      xorg-xserver-server(videodrv-abi) <= 8.0
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 Suggests:      %{name}-config
-Suggests:      kernel%{_alt_kernel}-video-firegl
+Suggests:      kernel-video-firegl
 Provides:      xorg-xserver-module(glx)
 Obsoletes:     X11-driver-firegl < 1:7.0.0
 Obsoletes:     XFree86-driver-firegl < 1:7.0.0
@@ -188,6 +188,9 @@ Release:    %{rel}@%{_kernel_ver_str}
 License:       ATI
 Group:         Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel}
+%if "%{_alt_kernel}" != "%{nil}"
+Provides:      kernel-video-firegl = %{epoch}:%{version}-%{rel}@%{_kernel_ver_str}
+%endif
 Requires(post,postun): /sbin/depmod
 
 %description -n kernel%{_alt_kernel}-video-firegl