- builds on ac

Changed files:
    frauddetector.spec -> 1.2

diff --git a/frauddetector.spec b/frauddetector.spec
index cf62a80a4940069d3cdac39437da2665c03874e8..8c902e8bf0ac30546cd2af37d873f6e291463829 100644 (file)
--- a/frauddetector.spec
+++ b/frauddetector.spec
@@ -1,5 +1,5 @@
 %define                svnrev  79
-%define                rel             0.1
+%define                rel             0.2
 %include       /usr/lib/rpm/macros.java
 Summary:       Log analyzer with based on GeoIP distance
 Name:          frauddetector
@@ -9,17 +9,22 @@ License:      Apache v2.0
 Group:         Development/Languages/Java
 # revno=
 # svn co http://frauddetector.googlecode.com/svn/trunk${revno:+@$revno} frauddetector
-# tar -cjf frauddetector-$(svnversion frauddetector).tar.bz2 --exclude=.svn frauddetector
+# tar -cjf frauddetector-$(svnversion frauddetector).tar.bz2 --exclude=.svn --exclude=GeoLiteCity.dat frauddetector
 # ../dropin frauddetector-$(svnversion frauddetector).tar.bz2
 Source0:       %{name}-%{svnrev}.tar.bz2
 # Source0-md5: 0bc4165092deacb904a66b381dc9f8c0
 URL:           http://courses.cs.ut.ee/2009/security-seminar/
 BuildRequires: ant
 BuildRequires: jdk
+BuildRequires: rpmbuild(macros) >= 1.553
+BuildRequires: sed >= 4.0
+Requires:      GeoIP-db-City
 Requires:      jpackage-utils
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _appdir         %{_datadir}/%{name}
+
 %description
 Frauddetector is log analyzer which can detect leaked passwords from
 log files if same username distance in GeoIP is far away.
@@ -27,17 +32,36 @@ log files if same username distance in GeoIP is far away.
 %prep
 %setup -q -n %{name}
 
+mv conf.sample.properties conf.properties
+%undos conf.properties
+sed -i -e '
+       s,=geoIP/GeoLiteCity.dat,=%{_datadir}/GeoIP/GeoLiteCity.dat,
+       s,=formats.xml,=%{_appdir}/formats.xml,
+' conf.properties
+
+cat <<'EOF' > %{name}.sh
+#!/bin/sh
+# Usage:
+# $0 [config.properties]
+exec java -jar %{_javadir}/%{name}.jar "$@"
+EOF
+
 %build
 %ant
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_javadir},%{_appdir}}
+cp -a frauddetector.jar $RPM_BUILD_ROOT%{_javadir}
+cp -a formats.xml $RPM_BUILD_ROOT%{_appdir}
+install -p %{name}.sh $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING
-%attr(755,root,root) %{_bindir}/dbus
+%doc conf.properties
+%attr(755,root,root) %{_bindir}/frauddetector
+%{_javadir}/%{name}.jar
+%{_appdir}