From a6f8e0a364383286bbfa81f4c125ece74d883cd0f67825102dc7ecddd3727727 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 16 Dec 2009 15:50:59 +0000
Subject: [PATCH] Accepting request 26776 from Base:System

Copy from Base:System/gpg2 based on submit request 26776 from user puzel

OBS-URL: https://build.opensuse.org/request/show/26776
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=33
---
 gpg2.changes | 11 +++++++++++
 gpg2.spec    | 11 ++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/gpg2.changes b/gpg2.changes
index 97fc42d..ec13ad0 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Dec 15 20:56:35 CET 2009 - jengelh@medozas.de
+
+- enable parallel building
+- SPARC needs large PIE model
+
+-------------------------------------------------------------------
+Sun Dec  6 08:52:32 UTC 2009 - coolo@novell.com
+
+- change -lang require to recommended
+
 -------------------------------------------------------------------
 Fri Nov 13 14:37:58 UTC 2009 - puzel@novell.com
 
diff --git a/gpg2.spec b/gpg2.spec
index 05dbb44..d849535 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -20,7 +20,7 @@
 
 Name:           gpg2
 Version:        2.0.13
-Release:        1
+Release:        2
 BuildRequires:  expect fdupes libpth-devel
 BuildRequires:  libgpg-error-devel >= 1.4
 BuildRequires:  libgcrypt-devel >= 1.4.0
@@ -34,11 +34,12 @@ BuildRequires:  libadns-devel
 BuildRequires:  openldap2-devel
 BuildRequires:  openldap2
 Url:            http://www.gnupg.org/aegypten2/
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Productivity/Networking/Security
 PreReq:         %install_info_prereq
 AutoReqProv:    on
-Requires:       pinentry dirmngr %name-lang = %{version}
+Requires:       pinentry dirmngr
+Recommends:     %name-lang = %{version}
 Provides:       newpg gpg = 1.4.9 gnupg = %{version}
 Obsoletes:      gpg < 1.4.9
 Summary:        GnuPG 2
@@ -72,7 +73,7 @@ Authors:
 # Required for patch7:
 autoreconf -fi
 # build PIEs (position independent executables) for address space randomisation:
-%ifarch s390x
+%ifarch s390x %sparc
 # s390x needs to use the large PIE model (at least for gpg.c):
 CFLAGS="%{optflags} -fPIE" LDFLAGS=-pie \
 %else
@@ -97,7 +98,7 @@ CFLAGS="%{optflags} -fpie" LDFLAGS=-pie \
     --enable-gpg \
     --enable-static-rnd=linux \
     --with-gnu-ld
-make
+make %{?jobs:-j%jobs};
 
 %install
 %makeinstall