From b96de7ca2eaae00dd3128d4542749162374aae9e28b538ec34e9631cb86fd895 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 17 Jun 2009 23:29:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aide?expand=0&rev=6 --- aide-0.13.1-as-needed.patch | 16 ++++++++++++++++ aide.changes | 5 +++++ aide.spec | 17 ++++++++++------- 3 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 aide-0.13.1-as-needed.patch diff --git a/aide-0.13.1-as-needed.patch b/aide-0.13.1-as-needed.patch new file mode 100644 index 0000000..aa65885 --- /dev/null +++ b/aide-0.13.1-as-needed.patch @@ -0,0 +1,16 @@ +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.changes b/aide.changes index 42bf006..f7faae2 100644 --- a/aide.changes +++ b/aide.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 17 19:43:10 CEST 2009 - crrodriguez@suse.de + +- fix build when as-needed is a default liker option + ------------------------------------------------------------------- Mon Jan 5 14:19:26 CET 2009 - meissner@suse.de diff --git a/aide.spec b/aide.spec index 3bc9cd9..014d8e0 100644 --- a/aide.spec +++ b/aide.spec @@ -23,7 +23,7 @@ BuildRequires: bison flex libacl-devel libattr-devel mhash-devel pkg-config zli BuildRequires: curl-devel libselinux-devel %define prefix /usr Version: 0.13.1 -Release: 48 +Release: 50 Summary: Advanced Intrusion Detection Environment License: GPL v2 or later Group: Productivity/Security @@ -31,6 +31,7 @@ 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/ @@ -45,11 +46,11 @@ Authors: %prep %setup -q -%patch0 -%{?suse_update_config:%{suse_update_config -l -f}} -autoconf +%patch0 +%patch1 %build +autoreconf -fiv CFLAGS="$RPM_OPT_FLAGS" \ ./configure \ --prefix=%{_prefix} \ @@ -98,6 +99,8 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) /etc/aide.conf %changelog +* Wed Jun 17 2009 crrodriguez@suse.de +- fix build when as-needed is a default liker option * Mon Jan 05 2009 meissner@suse.de - fixed abort on check/update by removing the hash requirement bnc#406597 - fixed version output bnc#463511 @@ -155,9 +158,9 @@ rm -rf $RPM_BUILD_ROOT - make SPEC file 7.0 compliant * Sat Jul 15 2000 mge@suse.de - initial SuSE RPM, config file /etc/aide.conf -* Tue Jan 25 2000 Matthew Kirkwood +* Wed Jan 26 2000 Matthew Kirkwood - Fixes for RH 6.1 and sysconfdir changed to /etc and /var/lib/aide added -* Sat Sep 11 1999 Rami Lehti +* Sun Sep 12 1999 Rami Lehti - Some small changes to make this autogeneratable by configure. -* Fri Sep 10 1999 Zach Brown +* Sat Sep 11 1999 Zach Brown - First go