- adjust defaults in config, add default logdir /var/log/kismet

Changed files:
    config.patch -> 1.1
    kismet.spec -> 1.57

diff --git a/config.patch b/config.patch
new file mode 100644 (file)
index 0000000..52e70f7
--- /dev/null
+++ b/config.patch
@@ -0,0 +1,22 @@
+--- kismet-2010-07-R1/conf/kismet.conf.in~     2010-05-23 17:04:25.000000000 +0300
++++ kismet-2010-07-R1/conf/kismet.conf.in      2011-01-12 23:48:34.065930750 +0200
+@@ -10,7 +10,7 @@
+ servername=Kismet_2009
+ 
+ # Prefix of where we log (as used in the logtemplate later)
+-# logprefix=/some/path/to/logs
++logprefix=@localstatedir@/log/kismet
+ 
+ # Do we process the contents of data frames?  If this is enabled, data
+ # frames will be truncated to the headers only immediately after frame type
+@@ -121,8 +121,8 @@
+ # OUI file, expected format 00:11:22<tab>manufname
+ # IEEE OUI file used to look up manufacturer info.  We default to the
+ # wireshark one since most people have that.
+-ouifile=/etc/manuf
+-ouifile=/usr/share/wireshark/wireshark/manuf
++#ouifile=/etc/manuf
++#ouifile=/usr/share/wireshark/wireshark/manuf
+ ouifile=/usr/share/wireshark/manuf
+ 
+ # Do we have a GPS?

diff --git a/kismet.spec b/kismet.spec
index 438ff8bbd60c90223f8e2d47ec675a2fb180c4b8..f362f62a4e708e63c2cadfba559662f233adfff8 100644 (file)
--- a/kismet.spec
+++ b/kismet.spec
@@ -1,17 +1,18 @@
 # TODO
 #  - Anybody knows, why it will not build, when kernel-headers are installed?
-#  - maybe subpkg server and add initscript to it?
+#  - maybe subpkg server and add initscript to it? especially as kismet server can be remote
 #
 %define                tarver  %(echo %{version} | tr _ -)
 Summary:       Wireless network sniffer
 Summary(pl.UTF-8):     Sniffer sieci bezprzewodowych
 Name:          kismet
 Version:       2010_07_R1
-Release:       0.1
+Release:       0.2
 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://www.kismetwireless.net/code/%{name}-%{tarver}.tar.gz
 # Source0-md5: 85e59186eb529889118b5635f35cf57d
+Patch0:                config.patch
 URL:           http://www.kismetwireless.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -50,6 +51,7 @@ wsparcie dla kart bez obsługi Monitora RF.
 
 %prep
 %setup -q -n %{name}-%{tarver}
+%patch0 -p1
 
 # make lib64 aware, include exec bits on install
 %{__sed} -i -e 's!\$(prefix)/lib/!%_libdir/!g' plugin-*/Makefile
@@ -76,7 +78,7 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_datadir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_datadir},/var/lib/%{name}}
 for dir in . %plugins; do
        %{__make} -C $dir install \
                DESTDIR="$RPM_BUILD_ROOT" \
@@ -111,3 +113,5 @@ rm -rf $RPM_BUILD_ROOT
 %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
+
+%dir /var/lib/%{name}