From 2c117cc51677b851886b6e233b4019a35d6fd27aa8fc53729a696bbdef97f5b6 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 7 Aug 2013 09:32:10 +0000
Subject: [PATCH] Conflicts with pssh; add black-bold color cosmetic fix from
 upstream

OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=11
---
 ...t-the-default-for-font-bolding-style.patch | 30 +++++++++++++++++++
 putty-03-config.diff                          |  4 +--
 putty.changes                                 |  8 +++++
 putty.spec                                    |  8 +++--
 4 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 0001-Revert-the-default-for-font-bolding-style.patch

diff --git a/0001-Revert-the-default-for-font-bolding-style.patch b/0001-Revert-the-default-for-font-bolding-style.patch
new file mode 100644
index 0000000..28b3a27
--- /dev/null
+++ b/0001-Revert-the-default-for-font-bolding-style.patch
@@ -0,0 +1,30 @@
+From dbc1513565d852397c7d1c189ed23a48aa4fcff7 Mon Sep 17 00:00:00 2001
+From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
+Date: Wed, 7 Aug 2013 06:22:52 +0000
+Subject: [PATCH] Revert the default for font bolding style back to using
+ colours rather than fonts. I broke this in r9559 when I added the option for
+ 'both', because the internal representation got offset by one so as to change
+ from a boolean to two bitfields and I must have confused myself about what
+ the default should be.
+
+git-svn-id: svn://svn.tartarus.org/sgt/putty@10008 cda61777-01e9-0310-a592-d414129be87e
+---
+ settings.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/settings.c b/settings.c
+index 6499686..df24f53 100644
+--- a/settings.c
++++ b/settings.c
+@@ -866,7 +866,7 @@ void load_open_settings(void *sesskey, Conf *conf)
+     gppi(sesskey, "TryPalette", 0, conf, CONF_try_palette);
+     gppi(sesskey, "ANSIColour", 1, conf, CONF_ansi_colour);
+     gppi(sesskey, "Xterm256Colour", 1, conf, CONF_xterm_256_colour);
+-    i = gppi_raw(sesskey, "BoldAsColour", 0); conf_set_int(conf, CONF_bold_style, i+1);
++    i = gppi_raw(sesskey, "BoldAsColour", 1); conf_set_int(conf, CONF_bold_style, i+1);
+ 
+     for (i = 0; i < 22; i++) {
+ 	static const char *const defaults[] = {
+-- 
+1.8.2
+
diff --git a/putty-03-config.diff b/putty-03-config.diff
index 3d41e4b..0d34fc6 100644
--- a/putty-03-config.diff
+++ b/putty-03-config.diff
@@ -1,8 +1,8 @@
 
 * Put 3DES off as insecure.
 * Always use "linux" terminal type. This resolves some
-  strange key combos
-* Set standard colors and use a more legilible font size
+  strange key combos.
+* Set standard colors and use a more legilible font size.
 
 ---
  settings.c        |   51 ++++++++++++++++++++++++++++++++++-----------------
diff --git a/putty.changes b/putty.changes
index 50b5f2c..45cf925 100644
--- a/putty.changes
+++ b/putty.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Aug  7 09:28:25 UTC 2013 - jengelh@inai.de
+
+- Add 0001-Revert-the-default-for-font-bolding-style.patch
+  (upstream patch fixing a cosmetic change introduced in 0.63)
+- Add Conflict tag against pssh package (Parallel SSH) due to
+  conflicting files in /usr/bin
+
 -------------------------------------------------------------------
 Tue Aug  6 19:47:43 UTC 2013 - jengelh@inai.de
 
diff --git a/putty.spec b/putty.spec
index 92a164d..64b19aa 100644
--- a/putty.spec
+++ b/putty.spec
@@ -26,14 +26,16 @@ Url:            http://www.chiark.greenend.org.uk/~sgtatham/putty/
 
 Source:         http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz
 Source2:        http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz.RSA
-Patch3:         putty-03-config.diff
-Patch4:         putty-04-nodate.diff
+Patch1:         0001-Revert-the-default-for-font-bolding-style.patch
+Patch2:         putty-03-config.diff
+Patch3:         putty-04-nodate.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1230
 BuildRequires:  gpg-offline
 %endif
 BuildRequires:  gtk2-devel
 BuildRequires:  krb5-devel
+Conflicts:      pssh
 
 %description
 PuTTY is a terminal emulator application which can act as a client
@@ -44,7 +46,7 @@ serial console client.
 cp %_sourcedir/%name-%version.tar.gz.RSA %_sourcedir/%name-%version.tar.gz.sig
 %{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.gz.sig}
 %setup -q
-%patch -P 3 -P 4 -p1
+%patch -P 1 -P 2 -P 3 -p1
 
 %build
 %configure