From cbaed12968328c907b9bc57296096cbc813f6edf57c8a529258c3259d2a109e5 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 10 Aug 2010 15:25:54 +0000
Subject: [PATCH] asneeded

OBS-URL: https://build.opensuse.org/package/show/security/aide?expand=0&rev=9
---
 aide-0.13.1-as-needed.patch | 16 ----------------
 aide-0.15-as-needed.patch   | 13 +++++++++++++
 aide.spec                   |  4 ++--
 3 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 aide-0.13.1-as-needed.patch
 create mode 100644 aide-0.15-as-needed.patch

diff --git a/aide-0.13.1-as-needed.patch b/aide-0.13.1-as-needed.patch
deleted file mode 100644
index aa65885..0000000
--- a/aide-0.13.1-as-needed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am.orig	2006-10-27 23:10:38.000000000 +0200
-+++ src/Makefile.am	2009-06-17 19:36:11.000000000 +0200
-@@ -50,9 +50,9 @@ aide_SOURCES =	\
- 
- INCLUDES = -I$(top_srcdir)/include
- 
--LDADD = -lm @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@
-+aide_LDADD = -lm @LDFLAGS@ @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@
- 
--AM_LDFLAGS = @LDFLAGS@ @LD_STATIC_FLAG@
-+AM_LDFLAGS = @LD_STATIC_FLAG@
- 
- AM_CFLAGS = @CFLAGS@ @MAINTAINER_MODE_TRUE@ -Wall -g
- 
diff --git a/aide-0.15-as-needed.patch b/aide-0.15-as-needed.patch
new file mode 100644
index 0000000..8e2ea20
--- /dev/null
+++ b/aide-0.15-as-needed.patch
@@ -0,0 +1,13 @@
+Index: aide-0.15/src/Makefile.am
+===================================================================
+--- aide-0.15.orig/src/Makefile.am
++++ aide-0.15/src/Makefile.am
+@@ -25,7 +25,7 @@ AM_YFLAGS= -d
+ #AM_LFLAGS= -d
+ LEX_OUTPUT_ROOT = lex.yy
+ 
+-LDADD = -lm @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @E2FSATTRSLIB@ @ELFLIB@
++LDADD = -lm @LDFLAGS@ @CRYPTLIB@ @ACLLIB@ @SELINUXLIB@ @AUDITLIB@ @ATTRLIB@ @E2FSATTRSLIB@ @ELFLIB@
+ AM_CFLAGS = @AIDE_DEFS@ -W -Wall -g
+ 
+ CLEANFILES = conf_yacc.h conf_yacc.c conf_lex.c db_lex.c *~
diff --git a/aide.spec b/aide.spec
index e46aed8..005e71e 100644
--- a/aide.spec
+++ b/aide.spec
@@ -30,7 +30,7 @@ Group:          Productivity/Security
 Source0:        http://www.cs.tut.fi/~rammer/aide-%{version}.tar.bz2
 Source1:        aide.conf
 Source2:        aide-cron_daily.sh
-Patch1:         aide-0.13.1-as-needed.patch
+Patch1:         aide-0.15-as-needed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://sourceforge.net/projects/aide/
 
@@ -45,7 +45,7 @@ Authors:
 
 %prep
 %setup -q
-#%patch1
+%patch1 -p1
 
 %build
 autoreconf -fiv