diff --git a/gtk-buildfix.diff b/gtk-buildfix.diff deleted file mode 100644 index 2b12d1b..0000000 --- a/gtk-buildfix.diff +++ /dev/null @@ -1,31 +0,0 @@ -From 230f7d56284a703c65c4fecf7e6f23b791043f81 Mon Sep 17 00:00:00 2001 -From: Zero King -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 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) - free(data); - free(col_css); - #else -- if (gtk_widget_get_window(win)) { -+ if (gtk_widget_get_window(widget)) { - /* For GTK1, which doesn't have a 'const' on - * gdk_window_set_background's second parameter type. */ - GdkColor col_mutable = *col; -- gdk_window_set_background(gtk_widget_get_window(win), &col_mutable); -+ gdk_window_set_background(gtk_widget_get_window(widget), &col_mutable); - } - #endif - } --- -2.12.2 - diff --git a/putty-0.69.tar.gz b/putty-0.69.tar.gz deleted file mode 100644 index 469f3a6..0000000 --- a/putty-0.69.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1 -size 2122306 diff --git a/putty-0.69.tar.gz.gpg b/putty-0.69.tar.gz.gpg deleted file mode 100644 index faa3331..0000000 Binary files a/putty-0.69.tar.gz.gpg and /dev/null differ diff --git a/putty-0.70.tar.gz b/putty-0.70.tar.gz new file mode 100644 index 0000000..b8380da --- /dev/null +++ b/putty-0.70.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be +size 2386108 diff --git a/putty-0.70.tar.gz.gpg b/putty-0.70.tar.gz.gpg new file mode 100644 index 0000000..1e07495 Binary files /dev/null and b/putty-0.70.tar.gz.gpg differ diff --git a/putty.changes b/putty.changes index 750094d..28102b2 100644 --- a/putty.changes +++ b/putty.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 11 22:22:08 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 0.70 + * Update Unicode data to version 9 +- Remove gtk-buildfix.diff (merged upstream) + ------------------------------------------------------------------- Tue May 2 13:07:52 UTC 2017 - bwiedemann@suse.com diff --git a/putty.spec b/putty.spec index a62f3da..d452cbc 100644 --- a/putty.spec +++ b/putty.spec @@ -17,7 +17,7 @@ Name: putty -Version: 0.69 +Version: 0.70 Release: 0 Summary: GTK-based terminal emulator program License: MIT @@ -30,7 +30,6 @@ 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.diff Patch3: reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick @@ -46,7 +45,7 @@ serial console client. %prep %setup -q -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -P 3 -p1 %build %configure