- up to 2010_07_R1

- dropped outdated configure options
- dropped outdated patches
- simplified install, verbose files
- install plugins to proper dir (checked from source which dir is actually used)

Changed files:
    kismet-if_arp.patch -> 1.2
    kismet.spec -> 1.55

diff --git a/kismet-if_arp.patch b/kismet-if_arp.patch
deleted file mode 100644 (file)
index f7cf64d..0000000
--- a/kismet-if_arp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- kismet-2010-01-R1.orig/configure.in        2010-01-07 23:33:30.000000000 +0000
-+++ kismet-2010-01-R1/configure.in     2010-01-15 03:40:30.000000000 +0000
-@@ -849,7 +849,11 @@
- havenetlink=yes
-       AC_CHECK_HEADERS([asm/types.h netlink/genl/genl.h netlink/genl/family.h netlink/genl/ctrl.h netlink/msg.h netlink/attr.h linux/nl80211.h linux/if_arp.h linux/wireless.h], 
-       AC_DEFINE(HAVE_NETLINKHEADERS, 1, Netlink headers are there), 
--      havenetlink=no)
-+      havenetlink=no,
-+      [[#ifdef HAVE_SYS_SOCKET_H
-+       # include <sys/socket.h>
-+       #endif
-+       ]])
- 
- 
- #if test "$havenetlink" = "yes"; then

diff --git a/kismet.spec b/kismet.spec
index 66a46337caae0594279e20c3a7813af3949a77d1..f8ed6cf7eb35e80bebc492452f41c0b1e7c7a5c2 100644 (file)
--- a/kismet.spec
+++ b/kismet.spec
@@ -2,17 +2,16 @@
 # TODO: Anybody knows, why it will not build,
 #      when kernel-headers are installed?
 #
+%define                tarver  %(echo %{version} | tr _ -)
 Summary:       Wireless network sniffer
 Summary(pl.UTF-8):     Sniffer sieci bezprzewodowych
 Name:          kismet
-Version:       2010_01_R1
-%define        _ver    2010-01-R1
-Release:       6
+Version:       2010_07_R1
+Release:       0.1
 License:       GPL
 Group:         Networking/Utilities
-Source0:       http://www.kismetwireless.net/code/%{name}-%{_ver}.tar.gz
-# Source0-md5: a6d6edcf65d5bb2cb5de6472bcc16f19
-Patch0:                %{name}-if_arp.patch
+Source0:       http://www.kismetwireless.net/code/%{name}-%{tarver}.tar.gz
+# Source0-md5: 85e59186eb529889118b5635f35cf57d
 URL:           http://www.kismetwireless.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -26,13 +25,14 @@ BuildRequires:      ncurses-ext-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
 BuildRequires: pkgconfig
+BuildRequires: sed >= 4.0
 # it uses internal structures - so strict deps
 %requires_eq   libpcap
 # plugin-btscan.so, not detected automatically for whatever reason
 Requires:      bluez-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define        plugins plugin-autowep plugin-btscan plugin-ptw plugin-spectools
+%define                plugins plugin-autowep plugin-btscan plugin-ptw plugin-spectools
 
 %description
 Kismet is a 802.11b wireless network sniffer. It is capable of
@@ -51,56 +51,41 @@ przechwytywanie pakietów poprzez libpcap (Cisco), oraz ograniczone
 wsparcie dla kart bez obsługi Monitora RF.
 
 %prep
-%setup -q -n %{name}-%{_ver}
-%patch0 -p1
+%setup -q -n %{name}-%{tarver}
 
-sed -i -e 's#-o $(INSTUSR)##g' -e 's#-o $(INSTGRP)##g' Makefile.in
+# make lib64 aware, include exec bits on install
+%{__sed} -i -e 's!\$(prefix)/lib/!%_libdir/!g' plugin-*/Makefile
+%{__sed} -i -e '/install/ s!-m644!-m755!' plugin-*/Makefile
+
+# make %doc friendly
+for a in plugin-*/README; do
+       mv $a README.${a%/README}
+done
 
 %build
 cp -f /usr/share/automake/config.* .
 %{__aclocal}
 %{__autoconf}
-CPPFLAGS="-I/usr/include/ncurses"
-%configure \
-       --enable-syspcap \
-       --with-linuxheaders=no \
-       --with-ethereal=%{_includedir} \
-%ifarch arm
-       --enable-zaurus
-%endif
+%configure
 
 %{__make} \
        CLIENTLIBS="-ldl -lncurses -lpanel -ltinfo"  # hack to add -ltinfo
 
 for plugin in %plugins; do
-       sed -ie 's/install -o $(INSTUSR) -g $(INSTGRP)/install/' $plugin/Makefile
-       %{__make} KIS_SRC_DIR=$PWD -C $plugin;
+       %{__make} -C $plugin \
+               KIS_SRC_DIR=$PWD
 done
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_datadir}}
-
-%{__make} install \
-       INSTGRP=$(id -g) \
-       MANGRP=$(id -g) \
-       prefix=$RPM_BUILD_ROOT%{_prefix} \
-       exec_prefix=$RPM_BUILD_ROOT%{_prefix} \
-       ETC=$RPM_BUILD_ROOT%{_sysconfdir} \
-       BIN=$RPM_BUILD_ROOT%{_bindir} \
-       SHARE=$RPM_BUILD_ROOT%{_datadir}/%{name} \
-       MAN=$RPM_BUILD_ROOT%{_mandir}
-
-for plugin in %plugins; do
-       %{__make} KIS_SRC_DIR=$PWD -C $plugin install \
-               INSTGRP=$(id -g) \
-               MANGRP=$(id -g) \
-               prefix=$RPM_BUILD_ROOT%{_prefix} \
-               exec_prefix=$RPM_BUILD_ROOT%{_prefix} \
-               ETC=$RPM_BUILD_ROOT%{_sysconfdir} \
-               BIN=$RPM_BUILD_ROOT%{_bindir} \
-               SHARE=$RPM_BUILD_ROOT%{_datadir}/%{name} \
-               MAN=$RPM_BUILD_ROOT%{_mandir}
+for dir in . %plugins; do
+       %{__make} -C $dir install \
+               DESTDIR="$RPM_BUILD_ROOT" \
+               KIS_SRC_DIR=$PWD \
+               INSTUSR=%(id -un) \
+               INSTGRP=%(id -gn) \
+               MANGRP=%(id -gn)
 done
 
 %clean
@@ -108,11 +93,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc docs/* CHANGELOG README
-%attr(755,root,root) %{_bindir}/*
+%doc docs/* CHANGELOG README README.plugin-*
+%attr(755,root,root) %{_bindir}/kismet
+%attr(755,root,root) %{_bindir}/kismet_client
+%attr(755,root,root) %{_bindir}/kismet_drone
+%attr(755,root,root) %{_bindir}/kismet_server
 %{_datadir}/%{name}
-%{_mandir}/man?/*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}*
-# FIXME: verify this path on x86_64, does Kismet search in lib64 or here?
-%attr(755,root,root) %{_prefix}/lib/kismet
-%attr(755,root,root) %{_prefix}/lib/kismet_client
+%{_mandir}/man1/kismet.1*
+%{_mandir}/man1/kismet_drone.1*
+%{_mandir}/man5/kismet.conf.5*
+%{_mandir}/man5/kismet_drone.conf.5*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kismet.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/kismet_drone.conf
+%dir %{_libdir}/kismet
+%dir %{_libdir}/kismet_client
+%attr(755,root,root) %{_libdir}/kismet/aircrack-kismet.so
+%attr(755,root,root) %{_libdir}/kismet/autowep-kismet.so
+%attr(755,root,root) %{_libdir}/kismet/btscan.so
+%attr(755,root,root) %{_libdir}/kismet/spectool_net.so
+%attr(755,root,root) %{_libdir}/kismet_client/btscan_ui.so
+%attr(755,root,root) %{_libdir}/kismet_client/spectools_ui.so