rpms/kernel/F-8 kernel.spec, 1.374, 1.375 linux-2.6-wireless-pending-fixups.patch, 1.1, 1.2

John W. Linville (linville) fedora-extras-commits at redhat.com
Tue Mar 11 00:43:41 UTC 2008


Author: linville

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7971

Modified Files:
	kernel.spec linux-2.6-wireless-pending-fixups.patch 
Log Message:
use correct license tag for iwlcore.ko


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- kernel.spec	10 Mar 2008 23:34:04 -0000	1.374
+++ kernel.spec	11 Mar 2008 00:43:05 -0000	1.375
@@ -1910,6 +1910,9 @@
 
 
 %changelog
+* Mon Mar 10 2008 John W. Linville <linville at redhat.com> 2.6.24.3-29
+- Use correct "Dual BSD/GPL" license tag for iwlcore.ko
+
 * Mon Mar 10 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.24.3-28
 - Fix license in iwlcore driver.
 

linux-2.6-wireless-pending-fixups.patch:

Index: linux-2.6-wireless-pending-fixups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/linux-2.6-wireless-pending-fixups.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-wireless-pending-fixups.patch	28 Feb 2008 03:18:34 -0000	1.1
+++ linux-2.6-wireless-pending-fixups.patch	11 Mar 2008 00:43:05 -0000	1.2
@@ -12,3 +12,15 @@
  		}
  	}
  
+diff -up linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c.orig linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c
+--- linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c.orig	2008-03-10 20:34:32.000000000 -0400
++++ linux-2.6.24.noarch/drivers/net/wireless/iwlwifi/iwl-core.c	2008-03-10 20:34:09.000000000 -0400
+@@ -39,7 +39,7 @@
+ MODULE_DESCRIPTION("iwl core");
+ MODULE_VERSION(IWLWIFI_VERSION);
+ MODULE_AUTHOR(DRV_COPYRIGHT);
+-MODULE_LICENSE("GPL/BSD");
++MODULE_LICENSE("Dual BSD/GPL");
+ 
+ #ifdef CONFIG_IWL4965_DEBUG
+ u32 iwl4965_debug_level;




More information about the fedora-extras-commits mailing list