From 26bd6b90849492cd32e1fdbdab9968baa5c5fa4426fc197f0ebf31b1745a1b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Fri, 19 Aug 2011 05:00:05 +0000
Subject: [PATCH] Accepting request 79279 from
 home:elvigia:branches:Base:System

- libcurl.m4 tests were broken, resulting in the usage
  of a "fake" internal libcurl.

OBS-URL: https://build.opensuse.org/request/show/79279
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=38
---
 gnupg-broken-curl-test.patch | 25 +++++++++++++++++++++++++
 gpg2.changes                 |  6 ++++++
 gpg2.spec                    | 10 ++++------
 3 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 gnupg-broken-curl-test.patch

diff --git a/gnupg-broken-curl-test.patch b/gnupg-broken-curl-test.patch
new file mode 100644
index 0000000..84ecf67
--- /dev/null
+++ b/gnupg-broken-curl-test.patch
@@ -0,0 +1,25 @@
+--- m4/libcurl.m4.orig
++++ m4/libcurl.m4
+@@ -68,13 +68,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
+ 
+      _libcurl_try_link=yes
+ 
+-     if test -d "$_libcurl_with" ; then
+-        LIBCURL_CPPFLAGS="-I$withval/include"
+-        _libcurl_ldflags="-L$withval/lib"
+-        AC_PATH_PROG([_libcurl_config],["$withval/bin/curl-config"])
+-     else
+ 	AC_PATH_PROG([_libcurl_config],[curl-config])
+-     fi
+ 
+      if test x$_libcurl_config != "x" ; then
+         AC_CACHE_CHECK([for the version of libcurl],
+@@ -141,7 +135,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
+            _libcurl_save_libs=$LIBS
+            LIBS="$LIBCURL $LIBS"
+ 
+-           AC_LINK_IFELSE([AC_LANG_PROGRAM([[include <curl/curl.h>]],[[
++           AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curl/curl.h>]],[[
+ /* Try and use a few common options to force a failure if we are
+    missing symbols or cannot link. */
+ int x;
diff --git a/gpg2.changes b/gpg2.changes
index ac7d236..2bf79f5 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 19 01:11:42 UTC 2011 - crrodriguez@opensuse.org
+
+- libcurl.m4 tests were broken, resulting in the usage
+  of a "fake" internal libcurl.
+
 -------------------------------------------------------------------
 Sat Aug  6 20:19:09 UTC 2011 - andreas.stieger@gmx.de
 
diff --git a/gpg2.spec b/gpg2.spec
index e9763e7..ed33686 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -57,6 +57,7 @@ Patch3:         gnupg-2.0.9-RSA_ES.patch
 Patch4:         gnupg-2.0.9-langinfo.patch
 Patch5:         gnupg-2.0.18-files-are-digests.patch
 Patch6:         gnupg-dont-fail-with-seahorse-agent.patch
+Patch7:         gnupg-broken-curl-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -72,6 +73,7 @@ gpg-agent, and a keybox library.
 %patch4
 %patch5 -p1
 %patch6 -p1
+%patch7
 
 %build
 autoreconf -fi
@@ -82,12 +84,7 @@ CFLAGS="%{optflags} -fPIE" LDFLAGS=-pie \
 %else
 CFLAGS="%{optflags} -fpie" LDFLAGS=-pie \
 %endif
-./configure \
-    --prefix=%{_prefix} \
-    --sysconfdir=/etc \
-    --libdir=%{_libdir} \
-    --infodir=%{_infodir} \
-    --mandir=%{_mandir} \
+%configure \
     --libexecdir=%{_libdir} \
     --docdir=%{_docdir}/%{name} \
     --with-agent-pgm=%{_prefix}/bin/gpg-agent \
@@ -98,6 +95,7 @@ CFLAGS="%{optflags} -fpie" LDFLAGS=-pie \
     --enable-gpgsm=yes \
     --enable-gpg \
     --with-gnu-ld
+
 make %{?_smp_mflags}
 
 %install