SPECS (LINUX_2_6_25): kernel-vanilla.spec, kernel.spec - properly obsolete ...

[patrys]

Author: patrys                       Date: Tue Jul 22 22:58:25 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_25
---- Log message:
- properly obsolete old iwlwifi modules (part of the tree since 2.6.24 or .25)

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.161 -> 1.162) , kernel.spec (1.441.2.1935.2.1 -> 1.441.2.1935.2.2) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.161 SPECS/kernel-vanilla.spec:1.162
--- SPECS/kernel-vanilla.spec:1.161	Mon Jul 14 14:08:03 2008
+++ SPECS/kernel-vanilla.spec	Wed Jul 23 00:58:17 2008
@@ -96,6 +96,8 @@
 Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
 Provides:	%{name}(vermagic) = %{kernel_release}
+Obsoletes:	kernel-vanilla-net-iwl3945
+Obsoletes:	kernel-vanilla-net-iwl4965
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
@@ -828,6 +830,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.162  2008/07/22 22:58:17  patrys
+- properly obsolete old iwlwifi modules (part of the tree since 2.6.24 or .25)
+
 Revision 1.161  2008/07/14 12:08:03  glen
 - use perl macro
 

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1935.2.1 SPECS/kernel.spec:1.441.2.1935.2.2
--- SPECS/kernel.spec:1.441.2.1935.2.1	Fri Jul 18 15:23:46 2008
+++ SPECS/kernel.spec	Wed Jul 23 00:58:17 2008
@@ -397,6 +397,8 @@
 Obsoletes:	kernel-net-hostap
 Obsoletes:	kernel-net-ieee80211
 Obsoletes:	kernel-net-ipp2p
+Obsoletes:	kernel-net-iwl3945
+Obsoletes:	kernel-net-iwl4965
 Obsoletes:	kernel-smp
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
@@ -1712,6 +1714,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1935.2.2  2008/07/22 22:58:17  patrys
+- properly obsolete old iwlwifi modules (part of the tree since 2.6.24 or .25)
+
 Revision 1.441.2.1935.2.1  2008/07/18 13:23:46  glen
 - revert kabi underscore for now; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-vanilla.spec?r1=1.161&r2=1.162&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1935.2.1&r2=1.441.2.1935.2.2&f=u