[Lunar-commits] <moonbase> wireless_tools: fix a conflict with kernel-headers-2.6 modules (different wireless.h files)

[Florin Braescu]

commit 387038738189d8a0c6225dd01b95fda6da8624d3
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Mon Dec 22 22:35:20 2008 +0200

    wireless_tools: fix a conflict with kernel-headers-2.6 modules (different wireless.h files)
---
 wifi/wireless_tools/BUILD   |   17 +++++++++--------
 wifi/wireless_tools/DETAILS |    7 +++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/wifi/wireless_tools/BUILD b/wifi/wireless_tools/BUILD
index 1cedbc5..51810e4 100644
--- a/wifi/wireless_tools/BUILD
+++ b/wifi/wireless_tools/BUILD
@@ -1,13 +1,14 @@
 (
 
-  make                                                         &&
-  prepare_install                                              &&
-  cp iwconfig iwgetid iwlist iwspy iwpriv /sbin/               &&
-  cp iwconfig.8 iwlist.8 iwspy.8 iwpriv.8 /usr/share/man/man8/ &&
-  cp libiw.so.${VERSION} /lib/                                 &&
-  cp iwlib.h wireless.h /usr/include/                          &&
-  ln -s /lib/libiw.so.${VERSION} /lib/libiw.so                 &&
-  ldconfig                                                     &&
+  patch_it $SOURCE_CACHE/$SOURCE2 1                             &&
+  make                                                          &&
+  prepare_install                                               &&
+  cp iwconfig iwgetid iwlist iwspy iwpriv /sbin/                &&
+  cp iwconfig.8 iwlist.8 iwspy.8 iwpriv.8 /usr/share/man/man8/  &&
+  cp libiw.so.${VERSION} /lib/                                  &&
+  cp iwlib.h /usr/include/                                      &&
+  ln -s /lib/libiw.so.${VERSION} /lib/libiw.so                  &&
+  ldconfig                                                      &&
 
   gather_docs HOTPLUG.txt PCMCIA.txt
 
diff --git a/wifi/wireless_tools/DETAILS b/wifi/wireless_tools/DETAILS
index 1f1087c..d514670 100644
--- a/wifi/wireless_tools/DETAILS
+++ b/wifi/wireless_tools/DETAILS
@@ -1,12 +1,15 @@
           MODULE=wireless_tools
          VERSION=29
           SOURCE=$MODULE.$VERSION.tar.gz
+         SOURCE2=$MODULE.$VERSION-header.patch.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE.$VERSION
-      SOURCE_URL=http://hpl.hp.com/personal/Jean_Tourrilhes/Linux/
+      SOURCE_URL=http://hpl.hp.com/personal/Jean_Tourrilhes/Linux
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:22040ac1497f4c5f8ddeca365591b01ae3475710
+     SOURCE2_VFY=sha1:06dff05c638b60ce2fb28509e60ab6efc16e4438
         WEB_SITE=http://hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
          ENTERED=20020219
-         UPDATED=20071005
+         UPDATED=20081222
            SHORT="Tools for wireless networking"
 
 cat << EOF