- noted lasso usage by one noinst example; added link patch to fix building it

diff --git a/gsasl-link.patch b/gsasl-link.patch
new file mode 100644 (file)
index 0000000..d45ac28
--- /dev/null
+++ b/gsasl-link.patch
@@ -0,0 +1,11 @@
+--- gsasl-1.8.0/examples/saml20/Makefile.am.orig       2012-05-21 08:22:18.000000000 +0200
++++ gsasl-1.8.0/examples/saml20/Makefile.am    2014-05-10 09:34:34.745200455 +0200
+@@ -22,7 +22,7 @@
+       $(LASSO_CFLAGS)
+ AM_LDFLAGS = -no-install
+ LDADD = $(top_builddir)/lib/src/libgsasl.la $(top_builddir)/gl/libgl.la \
+-      $(LASSO_LIBS)
++      $(LASSO_LIBS) -lgobject-2.0
+ 
+ EXTRA_DIST = README
+ EXTRA_DIST += gsasl-saml20-sp.php

diff --git a/gsasl.spec b/gsasl.spec
index fbe728f4a132497cf2844570f6894dcd8a215143..8fd5c61bed001309f26c3cfb48b63f20ae56519a 100644 (file)
--- a/gsasl.spec
+++ b/gsasl.spec
@@ -18,6 +18,7 @@ Source0:      http://ftp.gnu.org/gnu/gsasl/%{name}-%{version}.tar.gz
 # Source0-md5: 982fe54a20016aa46a871c084c990c36
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-heimdal-check.patch
+Patch2:                %{name}-link.patch
 URL:           http://www.gnu.org/software/gsasl/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.10
@@ -26,6 +27,8 @@ BuildRequires:        gettext-devel >= 0.18.1
 BuildRequires: gnutls-devel >= 1.2.0
 %{?with_gss:BuildRequires:     gss-devel >= 1.0.0}
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.1}
+# used by examples/saml20 (noinst only)
+#BuildRequires:        lasso-devel >= 2.2.1
 BuildRequires: libgcrypt-devel >= 1.3.0
 BuildRequires: libidn-devel >= 0.1.0
 %{?with_ntlm:BuildRequires:    libntlm-devel >= 0.3.5}
@@ -124,6 +127,7 @@ Statyczna biblioteka GNU SASL.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__rm} po/stamp-po