From f55d8e20661fac3fa53d1d3609ba0e21a32a5521fde452e187440d6a901d6d51 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linux.com>
Date: Tue, 27 Mar 2012 20:59:37 +0000
Subject: [PATCH] Accepting request 111472 from
 home:gregkh:branches:Base:System

Update to 2.0.19 version

OBS-URL: https://build.opensuse.org/request/show/111472
OBS-URL: https://build.opensuse.org/package/show/Base:System/gpg2?expand=0&rev=47
---
 gnupg-2.0.18.tar.bz2         |  3 ---
 gnupg-2.0.19.tar.bz2         |  3 +++
 gnupg-broken-curl-test.patch | 15 ++++-----------
 gpg2.changes                 |  5 +++++
 gpg2.spec                    | 32 +++++++++++++++++---------------
 5 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 gnupg-2.0.18.tar.bz2
 create mode 100644 gnupg-2.0.19.tar.bz2

diff --git a/gnupg-2.0.18.tar.bz2 b/gnupg-2.0.18.tar.bz2
deleted file mode 100644
index bd14eaa..0000000
--- a/gnupg-2.0.18.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b
-size 4016606
diff --git a/gnupg-2.0.19.tar.bz2 b/gnupg-2.0.19.tar.bz2
new file mode 100644
index 0000000..ce4b889
--- /dev/null
+++ b/gnupg-2.0.19.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efa23a8a925adb51c7d3b708c25b6d000300f5ce37de9bdec6453be7b419c622
+size 4187460
diff --git a/gnupg-broken-curl-test.patch b/gnupg-broken-curl-test.patch
index 84ecf67..fa96ee7 100644
--- a/gnupg-broken-curl-test.patch
+++ b/gnupg-broken-curl-test.patch
@@ -1,5 +1,7 @@
---- m4/libcurl.m4.orig
-+++ m4/libcurl.m4
+diff --git a/m4/libcurl.m4 b/m4/libcurl.m4
+index 7d1dbd3..92cf801 100644
+--- a/m4/libcurl.m4
++++ b/m4/libcurl.m4
 @@ -68,13 +68,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
  
       _libcurl_try_link=yes
@@ -14,12 +16,3 @@
  
       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 848267c..69c4859 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 27 20:38:27 UTC 2012 - gregkh@opensuse.org
+
+- update to upstream 2.0.19
+
 -------------------------------------------------------------------
 Tue Dec  6 10:58:36 UTC 2011 - vcizek@suse.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 51863c4..0157692 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gpg2
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,39 +16,41 @@
 #
 
 
-
 Name:           gpg2
-Version:        2.0.18
-Release:        4
+Version:        2.0.19
+Release:        0
 BuildRequires:  automake
 BuildRequires:  expect
 BuildRequires:  fdupes
-BuildRequires:  libgpg-error-devel >= 1.7
-BuildRequires:  libgcrypt-devel >= 1.4.0
-BuildRequires:  libksba-devel >= 1.0.7
+BuildRequires:  libadns-devel
 BuildRequires:  libassuan-devel >= 2.0.0
+BuildRequires:  libcurl-devel >= 7.10
+BuildRequires:  libgcrypt-devel >= 1.4.0
+BuildRequires:  libgpg-error-devel >= 1.7
+BuildRequires:  libksba-devel >= 1.0.7
 BuildRequires:  libusb-devel
+BuildRequires:  openldap2-devel
 BuildRequires:  readline-devel
 BuildRequires:  zlib-devel
-BuildRequires:  libadns-devel
-BuildRequires:  openldap2-devel
-BuildRequires:  libcurl-devel >= 7.10
 %if 0%{?suse_version} >= 1120
 BuildRequires:  libpth-devel >= 1.3.7
 %else
 BuildRequires:  pth >= 1.3.7
 %endif
 Url:            http://www.gnupg.org/aegypten2/
-License:        GPL-3.0+
-Group:          Productivity/Networking/Security
 PreReq:         %install_info_prereq
-Requires:       pinentry dirmngr
+Requires:       dirmngr
+Requires:       pinentry
 Recommends:     %name-lang = %{version}
-Provides:       newpg gpg = 1.4.9 gnupg = %{version}
+Provides:       gnupg = %{version}
+Provides:       gpg = 1.4.9
+Provides:       newpg
 # special feature needed for OBS signd
 Provides:       gpg2_signd_support
 Obsoletes:      gpg < 1.4.9
 Summary:        GnuPG 2
+License:        GPL-3.0+
+Group:          Productivity/Networking/Security
 Source:         gnupg-%{version}.tar.bz2
 Patch1:         gnupg-2.0.18-tmpdir.diff
 Patch2:         gnupg-2.0.4-install_tools.diff
@@ -72,7 +74,7 @@ gpg-agent, and a keybox library.
 %patch4
 %patch5 -p1
 %patch6 -p1
-%patch7
+%patch7 -p1
 
 %build
 autoreconf -fi