From 9c80d51886f2281560e81b7129b207f1aa416428 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Jun 20 2014 20:33:31 +0000 Subject: add marco_ignore-adding-a-window-if-already-present.patch to spec file --- diff --git a/marco.spec b/marco.spec index 934e027..9695f2b 100644 --- a/marco.spec +++ b/marco.spec @@ -14,7 +14,7 @@ Name: marco Version: %{branch}.0 -Release: 3%{?dist} +Release: 4%{?dist} #Release: 0.5%{?git_rel}%{?dist} Summary: MATE Desktop window manager License: LGPLv2+ and GPLv2+ @@ -35,6 +35,9 @@ Source5: window.png # 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 +Patch1: marco_ignore-adding-a-window-if-already-present.patch BuildRequires: desktop-file-utils BuildRequires: gtk2-devel @@ -84,6 +87,7 @@ cp %{SOURCE4} src/stock_minimize.png cp %{SOURCE5} src/window.png %patch0 -p1 -b .inline-icons +%patch1 -p1 -b .ignore-adding-a-window # needed for the patch and for git snapshot builds autoreconf -if @@ -163,6 +167,10 @@ fi %changelog +* Fri Jun 20 2014 Wolfgang Ulbrich - 1.8.0-4 +- add marco_ignore-adding-a-window-if-already-present.patch +- from upstream, fix hopefully rhbz (#1109528) + * Sat Jun 07 2014 Fedora Release Engineering - 1.8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild