From 64d8129499f870161b7ea10489c58e7d253a5b9b22fcc005309e93beabc02b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 29 May 2012 10:53:57 +0000 Subject: [PATCH] Accepting request 122719 from home:jengelh:branches:am http://lists.opensuse.org/opensuse-factory/2012-05/msg00752.html OBS-URL: https://build.opensuse.org/request/show/122719 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcaca?expand=0&rev=17 --- libcaca.changes | 6 ++++++ libcaca.spec | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libcaca.changes b/libcaca.changes index 819ab1f..afe4c0a 100644 --- a/libcaca.changes +++ b/libcaca.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 29 10:33:39 UTC 2012 - jengelh@inai.de + +- Use autoreconf instead of ./bootstrap since (a) that works, + (b) avoids the inflexible handcrafted automake version check + ------------------------------------------------------------------- Mon May 14 09:29:06 UTC 2012 - coolo@suse.com diff --git a/libcaca.spec b/libcaca.spec index adf367a..4974bab 100644 --- a/libcaca.spec +++ b/libcaca.spec @@ -183,13 +183,9 @@ chmod 0644 %{S:0} %patch1 %build -find ./ -name Makefile.in -delete -rm configure -#export LIBTOOL=/usr/bin/libtool +autoreconf -fi export CFLAGS="$CFLAGS %{optflags} -I../caca/" export CXXFLAGS="$CXXFLAGS %{optflags}" -./bootstrap -#autoreconf -fiv %configure --with-pic \ --program-prefix="%{?_program_prefix}" \ --enable-slang \ @@ -209,7 +205,7 @@ export CXXFLAGS="$CXXFLAGS %{optflags}" %else --enable-java=no %endif -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %makeinstall