From 32efb8bd50caa278c428f8a61d7e63a34352fff5d99f0c26245fb4df08a0e283 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 30 Apr 2013 14:31:02 +0000
Subject: [PATCH] Accepting request 173904 from
 openSUSE:Factory:Staging:Automake

- Removed AC_CONFIG_MACRO_DIR([m4]) from configure.in to fix
  build with new automake: aide-no_m4_dir.patch

OBS-URL: https://build.opensuse.org/request/show/173904
OBS-URL: https://build.opensuse.org/package/show/security/aide?expand=0&rev=18
---
 aide-no_m4_dir.patch | 10 ++++++++++
 aide.changes         |  6 ++++++
 aide.spec            |  7 ++++---
 3 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 aide-no_m4_dir.patch

diff --git a/aide-no_m4_dir.patch b/aide-no_m4_dir.patch
new file mode 100644
index 0000000..85cb39b
--- /dev/null
+++ b/aide-no_m4_dir.patch
@@ -0,0 +1,10 @@
+--- configure.in.orig	2013-04-26 13:23:50.536353946 +0200
++++ configure.in	2013-04-26 13:23:53.558406622 +0200
+@@ -2,7 +2,6 @@
+ 
+ dnl Initialize autoconf/automake
+ AC_INIT(aide, AIDE_VERSION)
+-AC_CONFIG_MACRO_DIR([m4])
+ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE
+ 
diff --git a/aide.changes b/aide.changes
index cdde4c3..d946235 100644
--- a/aide.changes
+++ b/aide.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 26 11:26:37 UTC 2013 - mmeister@suse.com
+
+- Removed AC_CONFIG_MACRO_DIR([m4]) from configure.in to fix
+  build with new automake: aide-no_m4_dir.patch
+
 -------------------------------------------------------------------
 Wed Jan  4 13:34:11 UTC 2012 - crrodriguez@opensuse.org
 
diff --git a/aide.spec b/aide.spec
index 6f53f01..4fb3203 100644
--- a/aide.spec
+++ b/aide.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package aide
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           aide
 BuildRequires:  automake
 BuildRequires:  bison
@@ -24,8 +23,8 @@ BuildRequires:  curl-devel
 BuildRequires:  flex
 BuildRequires:  libacl-devel
 BuildRequires:  libattr-devel
-BuildRequires:  libselinux-devel
 BuildRequires:  libgcrypt-devel
+BuildRequires:  libselinux-devel
 BuildRequires:  pkg-config
 BuildRequires:  zlib-devel
 Version:        0.15.1
@@ -37,6 +36,7 @@ Source0:        http://www.cs.tut.fi/~rammer/aide-%{version}.tar.bz2
 Source1:        aide.conf
 Source2:        aide-cron_daily.sh
 Patch1:         aide-%{version}-as-needed.patch
+Patch2:         aide-no_m4_dir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://sourceforge.net/projects/aide/
 
@@ -46,6 +46,7 @@ AIDE is an intrusion detection system that checks file integrity.
 %prep
 %setup -q
 %patch1 -p1
+%patch2
 
 %build
 autoreconf -fiv