packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec - remove _al...

[sparky]

Author: sparky                       Date: Wed Feb 16 22:14:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- remove _alt_kernel references from userspace (reverted uzsolt's commit)
- kernel module now provides: kernel-video-fglrx if built with _alt_kernel

---- Files affected:
packages/xorg-driver-video-fglrx:
   xorg-driver-video-fglrx.spec (1.223 -> 1.224) 

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.223 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.224
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.223	Wed Feb 16 23:03:31 2011
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Wed Feb 16 23:13:56 2011
@@ -32,7 +32,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
@@ -54,12 +54,12 @@
 %{?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
@@ -189,6 +189,9 @@
 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
@@ -445,6 +448,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.224  2011/02/16 22:13:56  sparky
+- remove _alt_kernel references from userspace (reverted uzsolt's commit)
+- kernel module now provides: kernel-video-fglrx if built with _alt_kernel
+
 Revision 1.223  2011/02/16 22:03:31  sparky
 - config subpackage is part of userspace: extended %if to cover its %files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.223&r2=1.224&f=u