diff --git a/marco.spec b/marco.spec index b51eb65..3553995 100644 --- a/marco.spec +++ b/marco.spec @@ -14,7 +14,7 @@ Name: marco Version: %{branch}.2 -Release: 1%{?dist} +Release: 2%{?dist} #Release: 0.5%{?git_rel}%{?dist} Summary: MATE Desktop window manager License: LGPLv2+ and GPLv2+ @@ -35,6 +35,8 @@ 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 @@ -84,6 +86,7 @@ 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 @@ -163,7 +166,10 @@ fi %changelog -* Tue Sep 30 2014 Wolfgang Ulbrich - 1.8.1-2 +* Fri Oct 03 2014 Wolfgang Ulbrich - 1.8.2-2 +- fix to fix a release, LOL + +* Tue Sep 30 2014 Wolfgang Ulbrich - 1.8.2-1 - update to 1.8.2 release * Sun Aug 17 2014 Fedora Release Engineering - 1.8.1-2 diff --git a/marco_fix-renaming-in-1.8.2.patch b/marco_fix-renaming-in-1.8.2.patch new file mode 100644 index 0000000..8f5a90c --- /dev/null +++ b/marco_fix-renaming-in-1.8.2.patch @@ -0,0 +1,42 @@ +From c2cbcaa90d88d3d74dc7b79cae17964f4243a51d Mon Sep 17 00:00:00 2001 +From: Stefano Karapetsas +Date: Thu, 02 Oct 2014 12:51:29 +0000 +Subject: Update keybindings files with new name + +--- +diff --git a/src/50-marco-desktop-key.xml.in b/src/50-marco-desktop-key.xml.in +index 00ebc91..f9e33c3 100644 +--- a/src/50-marco-desktop-key.xml.in ++++ b/src/50-marco-desktop-key.xml.in +@@ -1,5 +1,5 @@ + +- ++ + + + +diff --git a/src/50-marco-global-key.xml.in b/src/50-marco-global-key.xml.in +index 9a61c37..81a8db8 100644 +--- a/src/50-marco-global-key.xml.in ++++ b/src/50-marco-global-key.xml.in +@@ -1,5 +1,5 @@ + +- ++ + + + +diff --git a/src/50-marco-window-key.xml.in b/src/50-marco-window-key.xml.in +index 3aba645..5d79933 100644 +--- a/src/50-marco-window-key.xml.in ++++ b/src/50-marco-window-key.xml.in +@@ -1,5 +1,5 @@ + +- ++ + +