packages (Titanium-2_6_34): kernel-desktop/kernel-desktop.spec - merge -drm...

[shadzik]

Author: shadzik                      Date: Thu Aug 12 16:59:20 2010 GMT
Module: packages                      Tag: Titanium-2_6_34
---- Log message:
- merge -drm subpackage into main

---- Files affected:
packages/kernel-desktop:
   kernel-desktop.spec (1.204.2.116.2.2 -> 1.204.2.116.2.3) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.116.2.2 packages/kernel-desktop/kernel-desktop.spec:1.204.2.116.2.3
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.116.2.2	Thu Aug 12 17:22:49 2010
+++ packages/kernel-desktop/kernel-desktop.spec	Thu Aug 12 18:59:14 2010
@@ -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}
 
@@ -782,7 +758,7 @@
 /lib/modules/%{kernel_release}/kernel/crypto
 /lib/modules/%{kernel_release}/kernel/drivers
 %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
 
@@ -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,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.116.2.3  2010/08/12 16:59:14  shadzik
+- merge -drm subpackage into main
+
 Revision 1.204.2.116.2.2  2010/08/12 15:22:49  shadzik
 - Linux 2.6.34.3
 
================================================================

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