From b4ccd21087d3a37f1877b048101f5484aec0bbe7be7242d6ad9314ce418d1324 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Wed, 3 May 2017 19:08:42 +0000
Subject: [PATCH] use native patch format

OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=35
---
 gtk-buildfix.patch => gtk-buildfix.diff | 15 +++++++++++++--
 putty.changes                           |  2 +-
 putty.spec                              |  5 ++---
 3 files changed, 16 insertions(+), 6 deletions(-)
 rename gtk-buildfix.patch => gtk-buildfix.diff (64%)

diff --git a/gtk-buildfix.patch b/gtk-buildfix.diff
similarity index 64%
rename from gtk-buildfix.patch
rename to gtk-buildfix.diff
index 288a1d8..2b12d1b 100644
--- a/gtk-buildfix.patch
+++ b/gtk-buildfix.diff
@@ -1,7 +1,15 @@
-X-Git-Url: https://git.tartarus.org/?p=simon%2Fputty.git;a=blobdiff_plain;f=unix%2Fgtkwin.c;h=bca6daa43c2911e7912be8a57131684b7050d541;hp=69e335094c8eaf8546e402c674923da712f1ebd2;hb=230f7d56284a703c65c4fecf7e6f23b791043f81;hpb=fb023da0fdcbfca104b39c2315a79186d7254c99
+From 230f7d56284a703c65c4fecf7e6f23b791043f81 Mon Sep 17 00:00:00 2001
+From: Zero King <l2dy@macports.org>
+Date: Sun, 30 Apr 2017 11:01:13 +0100
+Subject: [PATCH] Fix thinko introduced in 8833634f4.
+
+This prevented compilation with Gtk 2.
+---
+ unix/gtkwin.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/unix/gtkwin.c b/unix/gtkwin.c
-index 69e3350..bca6daa 100644
+index 69e33509..bca6daa4 100644
 --- a/unix/gtkwin.c
 +++ b/unix/gtkwin.c
 @@ -2188,11 +2188,11 @@ void set_gtk_widget_background(GtkWidget *widget, const GdkColor *col)
@@ -18,3 +26,6 @@ index 69e3350..bca6daa 100644
      }
  #endif
  }
+-- 
+2.12.2
+
diff --git a/putty.changes b/putty.changes
index d713025..b8b5817 100644
--- a/putty.changes
+++ b/putty.changes
@@ -4,7 +4,7 @@ Tue May  2 12:11:41 UTC 2017 - idonmez@suse.com
 - Update to new upstream release 0.69
   * You can now explicitly configure SSH terminal mode settings
     not to be sent to the server, if your server objects to them.
-- Switch to gtk+3 interface.
+- Switch to gtk+3 interface, add gtk-buildfix.diff.
 
 -------------------------------------------------------------------
 Wed Mar 15 08:26:13 UTC 2017 - jengelh@inai.de
diff --git a/putty.spec b/putty.spec
index 2ae38d2..4bec74a 100644
--- a/putty.spec
+++ b/putty.spec
@@ -30,7 +30,7 @@ Source:         http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz
 Source2:        http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz.gpg
 Source4:        %name.keyring
 Patch1:         putty-03-config.diff
-Patch2:         gtk-buildfix.patch
+Patch2:         gtk-buildfix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ImageMagick
 BuildRequires:  gtk3-devel
@@ -45,8 +45,7 @@ serial console client.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
+%patch -P 1 -P 2 -p1
 
 %build
 %configure