rpms/lasso
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Automake 1.14 support

Browse Source
This commit is contained in:
Simo Sorce 2013-12-05 10:21:04 -05:00
parent 466da1dc33
commit 3e2579cda3
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
add-automake-14-support.patch Normal file
View File

@ -0,0 +1,15 @@
diff -uPr lasso-2.3.6.orig/autogen.sh lasso-2.3.6.new/autogen.sh
--- lasso-2.3.6.orig/autogen.sh 2013-12-05 10:17:14.853828723 -0500
+++ lasso-2.3.6.new/autogen.sh 2013-12-05 10:18:16.834233616 -0500
@@ -27,7 +27,10 @@
DIE=1
}
-if automake-1.13 --version < /dev/null > /dev/null 2>&1; then
+if 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
AUTOMAKE=automake-1.13
ACLOCAL=aclocal-1.13
elif automake-1.12 --version < /dev/null > /dev/null 2>&1; then

7
lasso.spec
View File

@ -11,7 +11,7 @@
Summary: Liberty Alliance Single Sign On Summary: Liberty Alliance Single Sign On
Name: lasso Name: lasso
Version: 2.3.6 Version: 2.3.6
Release: 0.20131125.3%{?dist} Release: 0.20131125.4%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://dev.entrouvert.org/lasso/lasso-%{version}.tar.gz Source: http://dev.entrouvert.org/lasso/lasso-%{version}.tar.gz
@ -24,6 +24,7 @@ BuildRequires: libxml2-devel, xmlsec1-devel, openssl-devel, xmlsec1-openssl-deve
Url: http://lasso.entrouvert.org/ Url: http://lasso.entrouvert.org/
Patch00: jumbo-2.3.6-to-master.patch Patch00: jumbo-2.3.6-to-master.patch
Patch01: add-automake-14-support.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
@ -97,6 +98,7 @@ library.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch00 -p1 %patch00 -p1
%patch01 -p1
# Temporary build fix, remove once 2.4.0 is released. # Temporary build fix, remove once 2.4.0 is released.
echo "2.3.6-g9c0848" > .tarball-version echo "2.3.6-g9c0848" > .tarball-version
@ -204,6 +206,9 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name}
%endif %endif
%changelog %changelog
* Thu Dec 5 2013 Simo Sorce <simo@redhat.com> 2.3.6-0.20131125.4
- Add patch to support automake-1.14 for rawhide
* Mon Nov 25 2013 Simo Sorce <simo@redhat.com> 2.3.6-0.20131125.3 * Mon Nov 25 2013 Simo Sorce <simo@redhat.com> 2.3.6-0.20131125.3
- Initial packaging - Initial packaging
- Based on the spec file by Jean-Marc Liger <jmliger@siris.sorbonne.fr> - Based on the spec file by Jean-Marc Liger <jmliger@siris.sorbonne.fr>