From ef191148e7ee63ee6b31195a1550df07808fe58a Mon Sep 17 00:00:00 2001
From: raveit65 <mate@raveit.de>
Date: Feb 11 2018 14:05:31 +0000
Subject: update to 1.20 release


---

diff --git a/.gitignore b/.gitignore
index f691b16..1ec5713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /mate-terminal-1.18.1.tar.xz
 /mate-terminal-1.19.0.tar.xz
 /mate-terminal-1.19.1.tar.xz
+/mate-terminal-1.20.0.tar.xz
diff --git a/mate-terminal.spec b/mate-terminal.spec
index f5be58f..650a048 100644
--- a/mate-terminal.spec
+++ b/mate-terminal.spec
@@ -2,7 +2,7 @@
 %global rel_build 1
 
 # This is needed, because src-url contains branched part of versioning-scheme.
-%global branch 1.19
+%global branch 1.20
 
 # Settings used for build from snapshots.
 %{!?rel_build:%global commit ac33ed09bb41ba717df3722cc71e25c1aa5134c5}
@@ -14,9 +14,9 @@
 
 Summary:        Terminal emulator for MATE
 Name:           mate-terminal
-Version:        %{branch}.1
+Version:        %{branch}.0
 %if 0%{?rel_build}
-Release:        2%{?dist}
+Release:        1%{?dist}
 %else
 Release:        0.6%{?git_rel}%{?dist}
 %endif
@@ -31,8 +31,6 @@ URL:            http://mate-desktop.org
 
 #Default to black bg white fg, unlimited scrollback, turn off use theme default
 Patch0:        mate-terminal_better_defaults-1.19.0.patch
-# https://github.com/mate-desktop/mate-terminal/pull/215
-Patch1:        mate-terminal_0001-middle-click-on-a-tab-add-the-gsettings-key-to-enabl.patch
 
 BuildRequires: dconf-devel
 BuildRequires: desktop-file-utils
@@ -52,10 +50,11 @@ backgrounds, opening multiple terminals in a single window (tabs) and
 clickable URLs.
 
 %prep
-%setup -q%{!?rel_build:n %{name}-%{commit}}
-
-%patch0 -p1 -b .better_defaults
-%patch1 -p1 -b .0001
+%if 0%{?rel_build}
+%autosetup -p1
+%else
+%autosetup -n %{name}-%{commit} -p1
+%endif
 
 %if 0%{?rel_build}
 #NOCONFIGURE=1 ./autogen.sh
@@ -82,15 +81,6 @@ desktop-file-install                                                    \
 %find_lang %{name} --with-gnome --all-name
 
 
-%postun
-if [ $1 -eq 0 ] ; then
-    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-%posttrans
-/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-
-
 %files -f %{name}.lang
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_bindir}/mate-terminal
@@ -103,6 +93,11 @@ fi
 
 
 %changelog
+* Sun Feb 11 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.20.0-1
+- update to 1.20.0 release
+- drop GSettings Schema rpm scriplet
+- switch to autosetup
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/mate-terminal_0001-middle-click-on-a-tab-add-the-gsettings-key-to-enabl.patch b/mate-terminal_0001-middle-click-on-a-tab-add-the-gsettings-key-to-enabl.patch
deleted file mode 100644
index 378ec0b..0000000
--- a/mate-terminal_0001-middle-click-on-a-tab-add-the-gsettings-key-to-enabl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 80b47cab8a5ea7183b362c1b169c1adcb57b5a0c Mon Sep 17 00:00:00 2001
-From: Pablo Barciela <scow@riseup.net>
-Date: Tue, 26 Dec 2017 01:37:17 +0100
-Subject: [PATCH] middle click on a tab: add the gsettings key to enable the
- feature
-
-Closes https://github.com/mate-desktop/mate-terminal/issues/184
----
- src/org.mate.terminal.gschema.xml.in | 5 +++++
- src/terminal-window.c                | 6 +++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/org.mate.terminal.gschema.xml.in b/src/org.mate.terminal.gschema.xml.in
-index 7696051..b8ea8fe 100644
---- a/src/org.mate.terminal.gschema.xml.in
-+++ b/src/org.mate.terminal.gschema.xml.in
-@@ -74,6 +74,11 @@
-       <summary>Whether to ask for confirmation when closing terminal windows</summary>
-       <description>Whether to ask for confirmation when closing a terminal window which has more than one open tab.</description>
-     </key>
-+    <key name="middle-click-closes-tabs" type="b">
-+      <default>false</default>
-+      <summary>Close tabs with middle click</summary>
-+      <description>If true, it enables the ability to close tabs using middle click.</description>
-+    </key>
-     <key name="ctrl-tab-switch-tabs" type="b">
-       <default>false</default>
-       <summary>Switch tabs with [Ctrl]+[Tab]</summary>
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 26655cb..5cdb6a4 100644
---- a/src/terminal-window.c
-+++ b/src/terminal-window.c
-@@ -2941,8 +2941,12 @@ notebook_button_press_cb (GtkWidget *widget,
-     int page_num;
-     int before_pages;
-     int later_pages;
-+    GSettings *settings;
-+
-+    settings = g_settings_new ("org.mate.terminal.global");
- 
--    if (event->type == GDK_BUTTON_PRESS && event->button == 2)
-+    if ((event->type == GDK_BUTTON_PRESS && event->button == 2) &&
-+            (g_settings_get_boolean (settings, "middle-click-closes-tabs")))
-     {
-         tab_clicked = find_tab_num_at_pos (notebook, event->x_root, event->y_root);
-         if (tab_clicked >= 0)
--- 
-2.13.6
-
diff --git a/sources b/sources
index b380433..284282b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mate-terminal-1.19.1.tar.xz) = 6822d6711cf0cd6ce87161a0619105bd82d81f319fe51d3f869ecda287d7b1710a915d75c3c4c6882858bb7040c87f1b74d1d70a47704a8a1136d2b7b0bbb81b
+SHA512 (mate-terminal-1.20.0.tar.xz) = f9283452cac962f8e3891e16d0208936086f1a8b9ae848f282071a6b9479dba02975c4945054074d1642302371149ba3d67c9d60aad6f9d8473f9d6696de8772