From 5dad05be993920d279206a3968e13a68a1e74a0edc438b4d00e434b7f9590193 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 10 Mar 2008 16:43:54 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=24

---
 curl-gssapi-libs.patch | 36 ++++++++++++++++++++++++++++++++++++
 curl.changes           |  6 ++++++
 curl.spec              |  7 ++++++-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 curl-gssapi-libs.patch

diff --git a/curl-gssapi-libs.patch b/curl-gssapi-libs.patch
new file mode 100644
index 0000000..4ff1894
--- /dev/null
+++ b/curl-gssapi-libs.patch
@@ -0,0 +1,36 @@
+---
+ configure.ac |   17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+--- configure.ac.orig
++++ configure.ac
+@@ -1010,18 +1010,23 @@ if test x"$want_gss" = xyes; then
+ 
+   if test -n "$gnu_gss"; then
+     curl_gss_msg="enabled (GNU GSS)"
+-    LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR -lgss"
++    LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
++    LIBS="$LIBS -lgss"
+   elif test -z "$GSSAPI_LIB_DIR"; then
+      if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+-        gss_ldflags=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
+-        LDFLAGS="$LDFLAGS $gss_ldflags"
++        dnl krb5-config doesn't have --libs-only-L or similar, put everything
++        dnl into LIBS
++        gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
++        LIBS="$LIBS $gss_libs"
+      elif test "$GSSAPI_ROOT" != "yes"; then
+-        LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff -lgssapi"
++        LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
++        LIBS="$LIBS -lgssapi"
+      else
+-        LDFLAGS="$LDFLAGS -lgssapi"
++        LIBS="$LIBS -lgssapi"
+      fi
+   else
+-     LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR -lgssapi"
++     LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
++     LIBS="$LIBS -lgssapi"
+   fi
+ else
+   CPPFLAGS="$save_CPPFLAGS"
diff --git a/curl.changes b/curl.changes
index c6a2361..c39c929 100644
--- a/curl.changes
+++ b/curl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 10 11:03:56 CET 2008 - mmarek@suse.cz
+
+- clean up curl-config --libs output, thanks to Cristian Rodríguez
+  for pointing it out
+
 -------------------------------------------------------------------
 Fri Mar  7 11:03:25 CET 2008 - mmarek@suse.cz
 
diff --git a/curl.spec b/curl.spec
index 8b3200e..77f202d 100644
--- a/curl.spec
+++ b/curl.spec
@@ -16,7 +16,7 @@ BuildRequires:  krb5-devel libidn-devel openldap2-devel openssl-devel zlib-devel
 # used by the testsuite
 BuildRequires:  stunnel
 Version:        7.18.0
-Release:        15
+Release:        16
 AutoReqProv:    on
 License:        BSD 3-Clause; X11/MIT
 Group:          Productivity/Networking/Web/Utilities
@@ -26,6 +26,7 @@ Source:         curl-%{version}.tar.bz2
 Patch1:         curl-test553.patch
 Patch2:         curl-use-openssl-cacerts.patch
 Patch3:         curl-better-gssapi-check.patch
+Patch4:         curl-gssapi-libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -91,6 +92,7 @@ Authors:
 %patch1
 %patch2
 %patch3
+%patch4
 
 %build
 autoreconf -fi
@@ -170,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*
 
 %changelog
+* Mon Mar 10 2008 mmarek@suse.cz
+- clean up curl-config --libs output, thanks to Cristian Rodríguez
+  for pointing it out
 * Fri Mar 07 2008 mmarek@suse.cz
 - build with gssapi support (thanks to Michael Calmer)
 * Mon Feb 18 2008 mmarek@suse.cz