raveit65 pushed to marco (master). "update to 1.10.1 release"

[notifications at fedoraproject.org]

From 6299c1ce8673889b151b147105f3d07b42051016 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me at raveit.de>
Date: Fri, 12 Jun 2015 16:35:24 +0200
Subject: update to 1.10.1 release


diff --git a/marco.spec b/marco.spec
index d115ba0..52d0ab7 100644
--- a/marco.spec
+++ b/marco.spec
@@ -13,9 +13,12 @@
 %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
 
 Name:          marco
-Version:       %{branch}.0
-Release:       2%{?dist}
-#Release:      0.5%{?git_rel}%{?dist}
+Version:       %{branch}.1
+%if 0%{?rel_build}
+Release:       1%{?dist}
+%else
+Release:       0.1%{?git_rel}%{?dist}
+%endif
 Summary:       MATE Desktop window manager
 License:       LGPLv2+ and GPLv2+
 URL:           http://mate-desktop.org
@@ -34,17 +37,7 @@ Source4:       stock_minimize.png
 Source5:       window.png
 
 # needed for fixing initial-setup issue, rhbz (#962009)
-Patch0:         marco_add-pixbuf-inline-icons_1.9.x.patch
-# https://github.com/mate-desktop/marco/pull/187
-Patch1:        marco_1.10-workspaces-keybindings.patch
-Patch2:        marco_1.10-windows-keybindings.patch
-# https://github.com/mate-desktop/marco/pull/160
-Patch3:        marco_add-tile-keybinds-1.patch
-Patch4:        marco_add-tile-keybinds-2.patch
-Patch5:        marco_add-tile-keybinds-3.patch
-Patch6:        marco_add-tile-keybinds-4.patch
-# https://github.com/mate-desktop/marco/pull/164
-Patch7:        marco_tile-preview-invalidate-window-before-showing.patch
+Patch0:        marco_add-pixbuf-inline-icons_1.9.x.patch
 
 Requires:      mate-desktop-libs
 
@@ -100,13 +93,6 @@ cp %{SOURCE4} src/stock_minimize.png
 cp %{SOURCE5} src/window.png
 
 %patch0 -p1 -b .inline-icons
-%patch1 -p1 -b .workspaces-keybindings
-%patch2 -p1 -b .windows-keybindings
-%patch3 -p1 -b .tile-keybinds-1
-%patch4 -p1 -b .tile-keybinds-2
-%patch5 -p1 -b .tile-keybinds-3
-%patch6 -p1 -b .tile-keybinds-4
-%patch7 -p1 -b .tile-preview
 
 # needed for the patch and for git snapshot builds
 autoreconf -if
@@ -186,6 +172,10 @@ fi
 
 
 %changelog
+* Fri Jun 12 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.10.1.1
+- update to 1.10.1 release
+- removed upstreamed patches
+
 * Wed Apr 22 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.10.0-2
 - fix workspaces keybindings
 - fix windows keybindings
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/marco.git/commit/?h=master&id=6299c1ce8673889b151b147105f3d07b42051016