packages (Titanium-2_6_34): kernel-desktop/kernel-desktop.spec - Linux 2.6....

[shadzik]

Author: shadzik                      Date: Tue Aug 17 09:08:51 2010 GMT
Module: packages                      Tag: Titanium-2_6_34
---- Log message:
- Linux 2.6.34.4
- remove file duplicates, as on Titanium, asume every desktop has a gpu :) have_drm condition is useless

---- Files affected:
packages/kernel-desktop:
   kernel-desktop.spec (1.204.2.116.2.4 -> 1.204.2.116.2.5) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.116.2.4 packages/kernel-desktop/kernel-desktop.spec:1.204.2.116.2.5
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.116.2.4	Fri Aug 13 19:11:35 2010
+++ packages/kernel-desktop/kernel-desktop.spec	Tue Aug 17 11:08:46 2010
@@ -40,14 +40,13 @@
 
 %{?debug:%define with_verbose 1}
 
-%define		have_drm	1
 %define		have_oss	1
 %define		have_sound	1
 %define		have_isa	1
 
 %define		_basever		2.6.34
-%define		_postver		.3
-%define		_rel			2
+%define		_postver		.4
+%define		_rel			1
 
 %define		_enable_debug_packages			0
 
@@ -78,7 +77,7 @@
 # Source0-md5:	10eebcb0178fb4540e2165bfd7efc7ad
 %if "%{_postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	53c4176b48a615b2837ed1a2db2f3c1f
+# Source1-md5:	158f4c022c3fecff98c329b6dc49e3b6
 %endif
 
 Source2:	kernel-desktop-autoconf.h
@@ -757,9 +756,6 @@
 /lib/modules/%{kernel_release}/kernel/arch
 /lib/modules/%{kernel_release}/kernel/crypto
 /lib/modules/%{kernel_release}/kernel/drivers
-%if %{have_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.
@@ -777,8 +773,6 @@
 %endif
 %dir /lib/modules/%{kernel_release}/misc
 %if %{with pcmcia}
-%dir /lib/modules/%{kernel_release}/kernel/drivers/pcmcia
-/lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/[!p]*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pd6729.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/*/pcmcia
@@ -813,9 +807,9 @@
 %if %{with pcmcia}
 %files pcmcia
 %defattr(644,root,root,755)
+%dir /lib/modules/%{kernel_release}/kernel/drivers/pcmcia
 /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/*ko*
 /lib/modules/%{kernel_release}/kernel/drivers/*/pcmcia
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/telephony/ixj_pcmcia.ko*
@@ -955,6 +949,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.116.2.5  2010/08/17 09:08:46  shadzik
+- Linux 2.6.34.4
+- remove file duplicates, as on Titanium, asume every desktop has a gpu :) have_drm condition is useless
+
 Revision 1.204.2.116.2.4  2010/08/13 17:11:35  shadzik
 - rel 2
 - enabled atl1c
================================================================

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