From f15a4f3b5fbcd125bc7a2985ac8c9971e46bb68b Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@redhat.com>
Date: Mon, 14 Sep 2015 14:13:41 -0400
Subject: [PATCH] Upgrade to new upstream 2.5.0 release Includes ECP support

---
 .gitignore              |  1 +
 automake-1.15-fix.patch | 15 ---------------
 lasso.spec              | 11 ++++++-----
 sources                 |  2 +-
 4 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 automake-1.15-fix.patch

diff --git a/.gitignore b/.gitignore
index 7865387..34ac5d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /lasso-2.3.6.tar.gz
 /lasso-2.4.0.tar.gz
 /lasso-2.4.1.tar.gz
+/lasso-2.5.0.tar.gz
diff --git a/automake-1.15-fix.patch b/automake-1.15-fix.patch
deleted file mode 100644
index d7e4405..0000000
--- a/automake-1.15-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
diff --git a/lasso.spec b/lasso.spec
index 5919cd5..1f9cc05 100644
--- a/lasso.spec
+++ b/lasso.spec
@@ -14,8 +14,8 @@
 
 Summary: Liberty Alliance Single Sign On
 Name: lasso
-Version: 2.4.1
-Release: 4%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 Source: http://dev.entrouvert.org/lasso/lasso-%{version}.tar.gz
@@ -28,8 +28,6 @@ BuildRequires: libxml2-devel, xmlsec1-devel, openssl-devel, xmlsec1-openssl-deve
 BuildRequires: libtool
 Url: http://lasso.entrouvert.org/
 
-Patch01: automake-1.15-fix.patch
-
 %description
 Lasso is a library that implements the Liberty Alliance Single Sign On
 standards, including the SAML and SAML2 specifications. It allows to handle
@@ -105,7 +103,6 @@ library.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch01 -p1
 
 %build
 LDFLAGS="${LDFLAGS} -fPIC"
@@ -220,6 +217,10 @@ rm -fr %{buildroot}%{_defaultdocdir}/%{name}
 %endif
 
 %changelog
+* Mon Sep 14 2015 John Dennis <jdennis@redhat.com> - 2.5.0-1
+- Upgrade to new upstream 2.5.0 release
+  Includes ECP support
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index fb0c62b..d675e0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6507ad5df2c81e1c3e6a4ef803f3d463  lasso-2.4.1.tar.gz
+197c980660dba3eb5984455b9250335c  lasso-2.5.0.tar.gz