From fc3d6dbc4e5d621cdc8e0ddddc940ed6e0bda0a2962ff0fe87e0cd1ab8790f0d Mon Sep 17 00:00:00 2001 From: Roman Drahtmueller Date: Wed, 27 Aug 2014 15:27:01 +0000 Subject: [PATCH] Accepting request 246404 from home:thomas-worm-sicsec:dev:mod_security Added backward compatibility for SLE 11 (aclocal fails on older distributions than openSuSE 13.1). Please forward to updates. OBS-URL: https://build.opensuse.org/request/show/246404 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_security2?expand=0&rev=49 --- apache2-mod_security2.changes | 7 +++++++ apache2-mod_security2.spec | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apache2-mod_security2.changes b/apache2-mod_security2.changes index 28a7d54..53bde9d 100644 --- a/apache2-mod_security2.changes +++ b/apache2-mod_security2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 25 19:33:11 UTC 2014 - thomas.worm@sicsec.de + +- Fixed spec file to work with older distribution versions. + Before openSuSE 13.1 aclocal doesn't work, instead autoreconf + has to be called. + ------------------------------------------------------------------- Mon Jul 7 14:06:19 CEST 2014 - draht@suse.de diff --git a/apache2-mod_security2.spec b/apache2-mod_security2.spec index ff9286b..dd2fcd9 100644 --- a/apache2-mod_security2.spec +++ b/apache2-mod_security2.spec @@ -84,9 +84,14 @@ bzip2 -dc %{SOURCE4} > %{_sourcedir}/%{faq} && touch -r %{SOURCE4} %{_sourcedir} #%patch2 %build +# aclocal only works with never distributions, +%if 0%{?suse_version} >= 1310 aclocal +# on older versions only autoconf is called. +%else +autoreconf -fi +%endif automake -#autoreconf -fi ./configure --with-apxs=%{apxs} --enable-request-early --enable-htaccess-config CFLAGS="%{optflags}" make %{?_smp_mflags}