rpms/kernel/devel config-generic, 1.242, 1.243 kernel.spec, 1.1317, 1.1318

[John W. Linville]

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21935

Modified Files:
	config-generic kernel.spec 
Log Message:
Drop CONFIG_WIRELESS_OLD_REGULATORY ; Add Conflicts for wireless-tools < 29-3 (used to pull-in crda)


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- config-generic	19 Feb 2009 21:13:00 -0000	1.242
+++ config-generic	20 Feb 2009 16:33:34 -0000	1.243
@@ -1339,7 +1339,7 @@
 CONFIG_NL80211=y
 CONFIG_LIB80211=m
 CONFIG_WIRELESS=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1317
retrieving revision 1.1318
diff -u -r1.1317 -r1.1318
--- kernel.spec	20 Feb 2009 01:53:41 -0000	1.1317
+++ kernel.spec	20 Feb 2009 16:33:34 -0000	1.1318
@@ -398,7 +398,7 @@
 # problems with the newer kernel or lack certain things that make
 # integration in the distro harder than needed.
 #
-%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0
+%define package_conflicts initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, iwl4965-firmware < 228.57.2, selinux-policy-targeted < 1.25.3-14, squashfs-tools < 4.0, wireless-tools < 29-3
 
 #
 # The ld.so.conf.d file we install uses syntax older ldconfig's don't grok.
@@ -1746,6 +1746,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Feb 20 2009 John W. Linville <linville at redhat.com> 2.6.29-0.137.rc5.git4
+- Drop CONFIG_WIRELESS_OLD_REGULATORY
+- Add Conflicts for wireless-tools < 29-3 (used to pull-in crda)
+
 * Thu Feb 19 2009 Dave Jones <davej at redhat.com> 2.6.29-0.136.rc5.git4
 - 2.6.29-rc5-git4