packages (Titanium): kernel-desktop/kernel-desktop.spec - move -drm subpack...

[shadzik]

Author: shadzik                      Date: Tue Aug 10 09:09:07 2010 GMT
Module: packages                      Tag: Titanium
---- Log message:
- move -drm subpackage to main kernel package
- reason: geninitrd fails to put your kms enabled drm driver to initrd while upgrading the kernel
- rel u- move -drm subpackage to main kernel package
- reason: geninitrd fails to put your kms enabled drm driver to initrd while upgrading the kernel
- rel extended

---- Files affected:
packages/kernel-desktop:
   kernel-desktop.spec (1.204.2.119 -> 1.204.2.120) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.119 packages/kernel-desktop/kernel-desktop.spec:1.204.2.120
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.119	Sun Aug  8 23:07:43 2010
+++ packages/kernel-desktop/kernel-desktop.spec	Tue Aug 10 11:09:01 2010
@@ -47,7 +47,7 @@
 
 %define		_basever		2.6.35
 %define		_postver		%{nil}
-%define		_rel			0.3141592
+%define		_rel			0.31415926
 
 %define		_enable_debug_packages			0
 
@@ -122,6 +122,7 @@
 Requires:	coreutils
 Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
+Obsoletes:	kernel%{_alt_kernel}-drm
 Obsoletes:	kernel%{_alt_kernel}-firmware
 Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
 Obsoletes:	kernel-misc-acer_acpi
@@ -253,25 +254,6 @@
 %description vmlinux -l pl.UTF-8
 vmlinux - rozpakowany obraz jądra.
 
-%package drm
-Summary:	DRM kernel modules
-Summary(de.UTF-8):	DRM Kernel Treiber
-Summary(pl.UTF-8):	Sterowniki DRM
-Group:		Base/Kernel
-Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Obsoletes:	kernel-smp-drm
-Autoreqprov:	no
-
-%description drm
-DRM kernel modules.
-
-%description drm -l de.UTF-8
-DRM Kernel Treiber.
-
-%description drm -l pl.UTF-8
-Sterowniki DRM.
-
 %package pcmcia
 Summary:	PCMCIA modules
 Summary(de.UTF-8):	PCMCIA Module
@@ -725,12 +707,6 @@
 mv -f /boot/vmlinux-%{alt_kernel} /boot/vmlinux-%{alt_kernel}.old 2> /dev/null > /dev/null
 ln -sf vmlinux-%{kernel_release} /boot/vmlinux-%{alt_kernel}
 
-%post drm
-%depmod %{kernel_release}
-
-%postun drm
-%depmod %{kernel_release}
-
 %post pcmcia
 %depmod %{kernel_release}
 
@@ -781,10 +757,10 @@
 /lib/modules/%{kernel_release}/kernel/arch
 /lib/modules/%{kernel_release}/kernel/crypto
 /lib/modules/%{kernel_release}/kernel/drivers
+/lib/modules/%{kernel_release}/kernel/fs
 %if %{have_drm}
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/gpu/drm
+/lib/modules/%{kernel_release}/kernel/drivers/gpu/drm
 %endif
-/lib/modules/%{kernel_release}/kernel/fs
 
 # this directory will be removed after disabling rcutorture mod. in 2.6.20.
 /lib/modules/%{kernel_release}/kernel/kernel
@@ -834,12 +810,6 @@
 %defattr(644,root,root,755)
 /boot/vmlinux-%{kernel_release}
 
-%if %{have_drm}
-%files drm
-%defattr(644,root,root,755)
-/lib/modules/%{kernel_release}/kernel/drivers/gpu/drm
-%endif
-
 %if %{with pcmcia}
 %files pcmcia
 %defattr(644,root,root,755)
@@ -985,6 +955,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.120  2010/08/10 09:09:01  shadzik
+- move -drm subpackage to main kernel package
+- reason: geninitrd fails to put your kms enabled drm driver to initrd while upgrading the kernel
+- rel u- move -drm subpackage to main kernel package
+- reason: geninitrd fails to put your kms enabled drm driver to initrd while upgrading the kernel
+- rel extended
+
 Revision 1.204.2.119  2010/08/08 21:07:43  lmasko
 - TuxOnIce adopted from kernel.spec.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop.spec?r1=1.204.2.119&r2=1.204.2.120&f=u