From 46f4df7899ba2dc7a1d0c6c4bbaa0f67ee3fd0cb Mon Sep 17 00:00:00 2001
From: raveit65 <mate@raveit.de>
Date: Feb 10 2018 16:09:04 +0000
Subject: update to 1.20.0


---

diff --git a/.gitignore b/.gitignore
index a83aefb..d55d4d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /marco-1.19.0.tar.xz
 /marco-1.19.1.tar.xz
 /marco-1.19.2.tar.xz
+/marco-1.20.0.tar.xz
diff --git a/marco.spec b/marco.spec
index 5a467d1..979db13 100644
--- a/marco.spec
+++ b/marco.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 62a708d461e08275d6b85985f5fa13fa8fbc85f7}
@@ -13,9 +13,9 @@
 %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
 
 Name:          marco
-Version:       %{branch}.2
+Version:       %{branch}.0
 %if 0%{?rel_build}
-Release:       2%{?dist}
+Release:       1%{?dist}
 %else
 Release:       0.8%{?git_rel}%{?dist}
 %endif
@@ -29,9 +29,6 @@ URL:           http://mate-desktop.org
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
-# https://github.com/mate-desktop/marco/pull/369
-Patch1:        marco_0001-Reset-tile_resized-to-false-when-fullscreening.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: gtk3-devel
 BuildRequires: libcanberra-devel
@@ -39,6 +36,7 @@ BuildRequires: libgtop2-devel
 BuildRequires: libSM-devel
 BuildRequireS: libsoup-devel
 BuildRequires: libXdamage-devel
+BuildRequires: libXpresent-devel
 BuildRequires: mate-common
 BuildRequires: mate-desktop-devel
 BuildRequires: zenity
@@ -78,9 +76,11 @@ Development files for marco
 
 
 %prep
-%setup -q%{!?rel_build:n %{name}-%{commit}}
-
-%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
@@ -115,14 +115,7 @@ desktop-file-install                                \
 
 %post libs -p /sbin/ldconfig
 
-%postun libs
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-%posttrans libs
-/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+%postun libs -p /sbin/ldconfig
 
 
 %files
@@ -162,6 +155,11 @@ fi
 
 
 %changelog
+* Sat Feb 10 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.0-1
+- update to 1.20 release
+- drop GSettings Schema rpm scriptlet
+- switch to using autosetup
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/marco_0001-Reset-tile_resized-to-false-when-fullscreening.patch b/marco_0001-Reset-tile_resized-to-false-when-fullscreening.patch
deleted file mode 100644
index bebdf93..0000000
--- a/marco_0001-Reset-tile_resized-to-false-when-fullscreening.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 20da02d6cb7c73d36af800b623c561c12b31a115 Mon Sep 17 00:00:00 2001
-From: Omar Zeidan <omar@zeidan.io>
-Date: Fri, 29 Dec 2017 08:45:00 +0100
-Subject: [PATCH] Reset tile_resized to false when fullscreening
-
-After resizing a tiled window, tile_resized gets set to true. Since it
-never got set back to false when fullscreening, it lead to weird
-behavior when unfullscreening the window.
----
- src/core/window.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/window.c b/src/core/window.c
-index 92e230a..cda28a6 100644
---- a/src/core/window.c
-+++ b/src/core/window.c
-@@ -2902,6 +2902,7 @@ meta_window_make_fullscreen_internal (MetaWindow  *window)
-       meta_window_save_rect (window);
- 
-       window->fullscreen = TRUE;
-+      window->tile_resized = FALSE;
-       window->force_save_user_rect = FALSE;
- 
-       meta_stack_freeze (window->screen->stack);
-@@ -2936,9 +2937,13 @@ meta_window_unmake_fullscreen (MetaWindow  *window)
- 
-       meta_topic (META_DEBUG_WINDOW_OPS,
-                   "Unfullscreening %s\n", window->desc);
--
-+      
-       window->fullscreen = FALSE;
--      target_rect = window->saved_rect;
-+
-+      if(!META_WINDOW_TILED (window))
-+        target_rect = window->saved_rect;
-+      else
-+        meta_window_get_current_tile_area(window, &target_rect);
- 
-       /* Window's size hints may have changed while maximized, making
-        * saved_rect invalid.  #329152
--- 
-2.13.6
-
diff --git a/sources b/sources
index a877547..a50c7ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (marco-1.19.2.tar.xz) = 8de844e2a7ae9ea0fee855e2ea578ad973030591f68a675a027b5cc24556511ac3a346216c719b757f1f3475f5c19f1223beb1d81c60e60d8e689cce398174a7
+SHA512 (marco-1.20.0.tar.xz) = cbc314aa46cf9134678c95a2485ca0d7e6d7afec05ef1e684657d44766abae1733f3697ffb3e2621bf882c0321375a31ddc2603201c1fb15759a04ed32fbe63c