From f40bdfe9f9e4276908bd69cea38c6cf94638dbedebabb4aa5d3421db24be60ed Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 10 Aug 2010 15:11:11 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/security/aide?expand=0&rev=7

---
 aide-0.13.1.tar.bz2    |  3 ---
 aide-0.15.tar.bz2      |  3 +++
 aide-version-fix.patch | 11 -----------
 aide.changes           |  6 ++++++
 aide.spec              | 17 +++++++++--------
 5 files changed, 18 insertions(+), 22 deletions(-)
 delete mode 100644 aide-0.13.1.tar.bz2
 create mode 100644 aide-0.15.tar.bz2
 delete mode 100644 aide-version-fix.patch

diff --git a/aide-0.13.1.tar.bz2 b/aide-0.13.1.tar.bz2
deleted file mode 100644
index 3f6bb68..0000000
--- a/aide-0.13.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b5ffce51d5570eb58f16b8eed86ce4a35614b1fffedc6c1f55f05c44df8e852
-size 238775
diff --git a/aide-0.15.tar.bz2 b/aide-0.15.tar.bz2
new file mode 100644
index 0000000..e9e1089
--- /dev/null
+++ b/aide-0.15.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fa81079ae23cf6538947c5544f194f4960c060b3f70039b31d9d960b8746ca4
+size 341195
diff --git a/aide-version-fix.patch b/aide-version-fix.patch
deleted file mode 100644
index e8a829a..0000000
--- a/aide-version-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -573,7 +573,7 @@
- )
- #  LDFLAGS=$save_LDFLAGS
-   AC_DEFINE(WITH_CURL,1,[use curl])
--	compoptionstring="${compoptionstring}WITH_CURL\\n"],
-+  compoptionstring="${compoptionstring}WITH_CURL\\n"
- fi
- 
- AC_ARG_WITH([gnu-regexp],
diff --git a/aide.changes b/aide.changes
index ec85586..f60d536 100644
--- a/aide.changes
+++ b/aide.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 30 00:40:34 CEST 2010 - ro@suse.de
+
+- make aide check verbose to get started 
+- add sleep and sync to fix build 
+
 -------------------------------------------------------------------
 Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
 
diff --git a/aide.spec b/aide.spec
index 7ee4bda..e46aed8 100644
--- a/aide.spec
+++ b/aide.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package aide (Version 0.13.1)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,15 +22,14 @@ Name:           aide
 BuildRequires:  bison flex libacl-devel libattr-devel mhash-devel pkg-config zlib-devel
 BuildRequires:  curl-devel libselinux-devel
 %define		prefix	/usr
-Version:        0.13.1
-Release:        51
+Version:        0.15
+Release:        52
 Summary:        Advanced Intrusion Detection Environment
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Productivity/Security
 Source0:        http://www.cs.tut.fi/~rammer/aide-%{version}.tar.bz2
 Source1:        aide.conf
 Source2:        aide-cron_daily.sh
-Patch:          aide-version-fix.patch
 Patch1:         aide-0.13.1-as-needed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://sourceforge.net/projects/aide/
@@ -46,8 +45,7 @@ Authors:
 
 %prep
 %setup -q
-%patch
-%patch1
+#%patch1
 
 %build
 autoreconf -fiv
@@ -81,9 +79,12 @@ install -m 700 -d $TESTDIR/var/lib/aide
 install -m 700 -d $TESTDIR/etc
 install -m 600    %{S:1} $TESTDIR/etc/aide.conf.new
 sed -e "s#/var/lib/aide#$TESTDIR/var/lib/aide#g" <$TESTDIR/etc/aide.conf.new >$TESTDIR/etc/aide.conf
+sleep 2
+sync
+sleep 2
 $TESTDIR/usr/bin/aide -c $TESTDIR/etc/aide.conf --init
 mv $TESTDIR/var/lib/aide/aide.db.new $TESTDIR/var/lib/aide/aide.db
-$TESTDIR/usr/bin/aide -c $TESTDIR/etc/aide.conf --check
+$TESTDIR/usr/bin/aide -c $TESTDIR/etc/aide.conf --check --verbose
 rm -rf $TESTDIR
 
 %clean