From 0b603cf9af9772354fe464502209c49c43e2ff9c Mon Sep 17 00:00:00 2001 From: John Dennis Date: Tue, 1 May 2018 11:36:44 -0400 Subject: [PATCH] Add missing patch for new automake version --- automake-version.patch | 16 ++++++++++++++++ lasso.spec | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 automake-version.patch diff --git a/automake-version.patch b/automake-version.patch new file mode 100644 index 0000000..b95b059 --- /dev/null +++ b/automake-version.patch @@ -0,0 +1,16 @@ +diff --git a/autogen.sh b/autogen.sh +index 4fcacfc5..bf0e0d3a 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -27,7 +27,10 @@ cd "$srcdir" + DIE=1 + } + +-if automake-1.15 --version < /dev/null > /dev/null 2>&1; then ++if automake-1.16 --version < /dev/null > /dev/null 2>&1; then ++ AUTOMAKE=automake-1.16 ++ ACLOCAL=aclocal-1.16 ++elif automake-1.15 --version < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-1.15 + ACLOCAL=aclocal-1.15 + elif automake-1.14 --version < /dev/null > /dev/null 2>&1; then diff --git a/lasso.spec b/lasso.spec index 3b35353..ebce0a6 100644 --- a/lasso.spec +++ b/lasso.spec @@ -24,6 +24,7 @@ patch1: java_binding_lasso_log.patch patch2: cflags.patch patch3: validate_idp_list_test.patch patch4: xmlSecSoap.patch +patch5: automake-version.patch %if %{with_wsf} BuildRequires: cyrus-sasl-devel @@ -121,6 +122,7 @@ library. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build ./autogen.sh