OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=25

gnupg-2.0.10-fix-missing-option.patch

@@ -0,0 +1,44 @@
+# From upstream, SVN rev. 4937
+# Fix (bnc#477362)
+Index: doc/gpg-agent.texi
+===================================================================
+--- doc/gpg-agent.texi	(revision 4936)
++++ doc/gpg-agent.texi	(revision 4937)
+@@ -433,13 +433,13 @@
+ @item --display @var{string}
+ @itemx --ttyname @var{string}
+ @itemx --ttytype @var{string}
+-@itemx --lc-type @var{string}
++@itemx --lc-ctype @var{string}
+ @itemx --lc-messages @var{string}
+ @itemx --xauthority @var{string}
+ @opindex display 
+ @opindex ttyname 
+ @opindex ttytype 
+-@opindex lc-type 
++@opindex lc-ctype 
+ @opindex lc-messages
+ @opindex xauthority
+ These options are used with the server mode to pass localization
+Index: agent/gpg-agent.c
+===================================================================
+--- agent/gpg-agent.c	(revision 4936)
++++ agent/gpg-agent.c	(revision 4937)
+@@ -1,6 +1,6 @@
+ /* gpg-agent.c  -  The GnuPG Agent
+  * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+- *               2006, 2007 Free Software Foundation, Inc.
++ *               2006, 2007, 2009 Free Software Foundation, Inc.
+  *
+  * This file is part of GnuPG.
+  *
+@@ -141,6 +141,9 @@
+   { oDisableScdaemon, "disable-scdaemon", 0, N_("do not use the SCdaemon") },
+   { oFakedSystemTime, "faked-system-time", 2, "@" }, /* (epoch time) */
+ 
++  { oBatch,      "batch",       0, "@" },
++  { oHomedir,    "homedir",     2, "@"},   
++
+   { oDisplay,    "display",     2, "@" },
+   { oTTYname,    "ttyname",     2, "@" },
+   { oTTYtype,    "ttytype",     2, "@" },

gpg2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar  2 15:53:22 CET 2009 - puzel@suse.cz
+
+- gnupg-2.0.10-fix-missing-option.patch (bnc#477362) 
+
 -------------------------------------------------------------------
 Mon Jan 19 16:16:11 CET 2009 - puzel@suse.cz
 

gpg2.spec

@@ -20,7 +20,7 @@
 
 Name:           gpg2
 Version:        2.0.10
-Release:        2
+Release:        3
 BuildRequires:  expect fdupes pth
 BuildRequires:  libgpg-error-devel >= 1.4
 BuildRequires:  libgcrypt-devel >= 1.4.0
@@ -50,6 +50,8 @@ Patch9:         gnupg-2.0.4-default-tty.diff
 Patch10:        gnupg-2.0.9-RSA_ES.patch
 Patch11:        gnupg-2.0.9-langinfo.patch
 Patch12:        gnupg-2.0.10-fix-convert.patch
+# PATCH-FIX-UPSTREAM gnupg-2.0.10-fix-missing.option.patch bnc477362 petr.uzel@suse.cz -- gnupg2 SVN rev. 4937
+Patch13:        gnupg-2.0.10-fix-missing-option.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -73,6 +75,7 @@ Authors:
 %patch10 -p1
 %patch11
 %patch12
+%patch13
 
 %build
 # Required for patch7:
@@ -154,6 +157,8 @@ $RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p secsplit- --secret-to-public --uncompress
 %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
 
 %changelog
+* Mon Mar 02 2009 puzel@suse.cz
+- gnupg-2.0.10-fix-missing-option.patch (bnc#477362)
 * Mon Jan 19 2009 puzel@suse.cz
 - add gnupg-2.0.10-fix-convert.patch
   - fix broken 'make check' on ppc, s390 and s390x