[marco/epel7] update to 1.8.3 release

[Wolfgang Ulbrich]

commit 138070f0322a0647446ef5cbd73e10d51f0324c4
Author: raveit65 <chat-to-me at raveit.de>
Date:   Mon Mar 9 14:06:48 2015 +0100

    update to 1.8.3 release

 .gitignore |  1 +
 marco.spec | 14 ++++++++------
 sources    |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c028994..d1ca0a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /marco-1.8.0.tar.xz
 /marco-1.8.1.tar.xz
 /marco-1.8.2.tar.xz
+/marco-1.8.3.tar.xz
diff --git a/marco.spec b/marco.spec
index 04cfc5e..1f33a98 100644
--- a/marco.spec
+++ b/marco.spec
@@ -13,8 +13,8 @@
 %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
 
 Name:           marco
-Version:        %{branch}.2
-Release:        3%{?dist}
+Version:        %{branch}.3
+Release:        1%{?dist}
 #Release:       0.5%{?git_rel}%{?dist}
 Summary:        MATE Desktop window manager
 License:        LGPLv2+ and GPLv2+
@@ -35,8 +35,6 @@ Source5:        window.png
 
 # needed for fixing initial-setup issue, rhbz (#962009)
 Patch0:         marco_add-pixbuf-inline-icons.patch
-# http://git.mate-desktop.org/marco/commit/?h=1.8&id=c2cbcaa
-Patch1:         marco_fix-renaming-in-1.8.2.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
@@ -46,7 +44,7 @@ BuildRequires: libSM-devel
 BuildRequireS: libsoup-devel
 BuildRequires: libXdamage-devel
 BuildRequires: mate-common
-BuildRequires: mate-dialogs
+BuildRequires: zenity
 BuildRequires: startup-notification-devel
 BuildRequires: yelp-tools
 
@@ -75,7 +73,6 @@ cp %{SOURCE4} src/stock_minimize.png
 cp %{SOURCE5} src/window.png
 
 %patch0 -p1 -b .inline-icons
-%patch1 -p1 -b .fix-renaming
 
 # needed for the patch and for git snapshot builds
 autoreconf -if
@@ -155,6 +152,11 @@ fi
 
 
 %changelog
+* Mon Mar 09 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.3-1
+- update to 1.8.3 release
+- remove upstreamed patches
+- add BR zenity, drop mate-dialogs
+
 * Fri Mar 06 2015 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.2-3
 - rebuild for libgtop2 soname bump
 
diff --git a/sources b/sources
index 12b5417..47c8d21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-265dc15c523a4688de0e10eb976df751  marco-1.8.2.tar.xz
+bf22da6cac998be5de2296d51a96b1c2  marco-1.8.3.tar.xz