Add support for automake 1.15

This commit is contained in:
Simo Sorce 2015-01-23 13:32:15 -05:00
parent d7ef5c16a5
commit 9c24fbff3d
2 changed files with 19 additions and 0 deletions

15
automake-1.15-fix.patch Normal file
View File

@ -0,0 +1,15 @@
diff -uPr lasso-2.4.1.orig/autogen.sh lasso-2.4.1/autogen.sh
--- lasso-2.4.1.orig/autogen.sh 2014-03-27 18:26:07.152022906 -0400
+++ lasso-2.4.1/autogen.sh 2015-01-23 13:29:57.651233095 -0500
@@ -27,7 +27,10 @@
DIE=1
}
-if automake-1.14 --version < /dev/null > /dev/null 2>&1; then
+if 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
AUTOMAKE=automake-1.14
ACLOCAL=aclocal-1.14
elif automake-1.13 --version < /dev/null > /dev/null 2>&1; then

View File

@ -27,6 +27,8 @@ BuildRequires: glib2-devel, swig
BuildRequires: libxml2-devel, xmlsec1-devel, openssl-devel, xmlsec1-openssl-devel BuildRequires: libxml2-devel, xmlsec1-devel, openssl-devel, xmlsec1-openssl-devel
Url: http://lasso.entrouvert.org/ Url: http://lasso.entrouvert.org/
Patch01: automake-1.15-fix.patch
%description %description
Lasso is a library that implements the Liberty Alliance Single Sign On Lasso is a library that implements the Liberty Alliance Single Sign On
standards, including the SAML and SAML2 specifications. It allows to handle standards, including the SAML and SAML2 specifications. It allows to handle
@ -101,6 +103,7 @@ library.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch01 -p1
%build %build
./autogen.sh ./autogen.sh
@ -211,6 +214,7 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name}
%changelog %changelog
* Fri Jan 23 2015 Simo Sorce <simo@redhat.com> - 2.4.1-2 * Fri Jan 23 2015 Simo Sorce <simo@redhat.com> - 2.4.1-2
- Enable perl bindings - Enable perl bindings
- Also add support for building with automake 1.15
* Thu Aug 28 2014 Simo Sorce <simo@redhat.com> - 2.4.1-1 * Thu Aug 28 2014 Simo Sorce <simo@redhat.com> - 2.4.1-1
- New upstream relase 2.4.1 - New upstream relase 2.4.1