From 9112ccce567ccc49f69334fbd0e1b40fef985b8d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 24 Oct 2014 12:45:57 +0000 Subject: [PATCH] Accepting request 258193 from home:aljex:branches:Base:System Small correction to which targets don't want autoconf. Fixes OS 10.2. Builds on everything from SL 10.0 to current now. OBS-URL: https://build.opensuse.org/request/show/258193 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=189 --- bash.changes | 5 +++++ bash.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bash.changes b/bash.changes index ceb5e5d1..fa1a64db 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 24 04:16:32 UTC 2014 - brian@aljex.com + +- Skip autoconf on OS 10.2 or older + ------------------------------------------------------------------- Wed Oct 22 13:44:23 UTC 2014 - werner@suse.de diff --git a/bash.spec b/bash.spec index 5ae65c35..d7f652e9 100644 --- a/bash.spec +++ b/bash.spec @@ -20,9 +20,9 @@ Name: bash BuildRequires: audit-devel -BuildRequires: autoconf BuildRequires: bison %if %suse_version > 1020 +BuildRequires: autoconf BuildRequires: fdupes %endif %if %suse_version > 1220 @@ -364,7 +364,7 @@ done MACHTYPE=${CPU}-suse-linux export LANG LC_ALL HOSTTYPE MACHTYPE pushd ../readline-%{rl_vers}%{extend} -%if 0%suse_version >= 1020 +%if 0%suse_version > 1020 autoconf %endif cflags () @@ -484,7 +484,7 @@ popd CC_FOR_BUILD="$CC" CFLAGS_FOR_BUILD="$CFLAGS" export CC_FOR_BUILD CFLAGS_FOR_BUILD CFLAGS LDFLAGS CC -%if 0%suse_version >= 1020 +%if 0%suse_version > 1020 autoconf %endif #