[mate-window-manager/f20] add mate-window-manager_ignore-adding-a-window-if-already-present.patch to spec file

Wolfgang Ulbrich raveit65 at fedoraproject.org
Fri Jun 20 21:00:24 UTC 2014


commit 34f4725170a96c81b9e5f4072764b161be2e9673
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Jun 20 23:00:18 2014 +0200

    add mate-window-manager_ignore-adding-a-window-if-already-present.patch to spec file

 mate-window-manager.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/mate-window-manager.spec b/mate-window-manager.spec
index c56f129..974824c 100644
--- a/mate-window-manager.spec
+++ b/mate-window-manager.spec
@@ -1,6 +1,6 @@
 Name:           mate-window-manager
 Version:        1.6.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MATE Desktop window manager
 License:        LGPLv2+ and GPLv2+
 URL:            http://mate-desktop.org
@@ -19,6 +19,11 @@ Patch0:         mate-window-manager_add-pixbuf-inline-icons.patch
 Patch1:         mate-window-manager_side-by-side-tiling.patch
 Patch2:         mate-window-manager_window-snapping-top-screen.patch
 %endif
+# needed for fixing initial-setup issue, rhbz (#962009)
+Patch0:         marco_add-pixbuf-inline-icons.patch
+# fix hopefully rhbz (#1109528)
+# https://github.com/mate-desktop/marco/commit/064f1ff
+Patch3:         mate-window-manager_ignore-adding-a-window-if-already-present.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gtk2-devel
@@ -62,6 +67,7 @@ cp %{SOURCE6} src/window.png
 %patch1 -p1 -b .side-by-side-tiling
 %patch2 -p1 -b .window-snapping-top-screen
 %endif
+%patch3 -p1 -b .ignore-adding-a-window
 
 NOCONFIGURE=1 ./autogen.sh
 
@@ -137,6 +143,10 @@ fi
 
 
 %changelog
+* Fri Jun 20 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-7
+- add marco_ignore-adding-a-window-if-already-present.patch
+- from upstream, fix hopefully rhbz (#1109528)
+
 * Wed Nov 13 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.2-6
 - start with side-by-side-tiling and windows-snapping-top-screen support for f20
 


More information about the scm-commits mailing list