Backport MR #14 to move eog back to Utilities submenu

14.patch

@@ -0,0 +1,56 @@
+From f18150d68204f2a23f4874e45363df1112fd1620 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Fri, 24 Jan 2020 08:11:24 +0100
+Subject: [PATCH] layout: Update eog desktop filename
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-menus/issues/14
+---
+ layout/gnome-applications.menu | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
+index f8d3d48..03855c5 100644
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -33,12 +33,12 @@
+       <!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
+ 
+            Please keep the list alphabetically sorted! -->
+-      <Filename>eog.desktop</Filename>
+       <Filename>gucharmap.desktop</Filename>
+       <Filename>org.gnome.Calculator.desktop</Filename>
+       <Filename>org.gnome.DejaDup.desktop</Filename>
+       <Filename>org.gnome.Dictionary.desktop</Filename>
+       <Filename>org.gnome.DiskUtility.desktop</Filename>
++      <Filename>org.gnome.eog.desktop</Filename>
+       <Filename>org.gnome.Evince.desktop</Filename>
+       <Filename>org.gnome.FileRoller.desktop</Filename>
+       <Filename>org.gnome.font-viewer.desktop</Filename>
+@@ -108,7 +108,7 @@
+     <Include>
+       <And>
+         <Category>Graphics</Category>
+-        <Not><Filename>eog.desktop</Filename></Not>
++        <Not><Filename>org.gnome.eog.desktop</Filename></Not>
+         <Not><Filename>org.gnome.Evince.desktop</Filename></Not>
+         <Not><Filename>simple-scan.desktop</Filename></Not>
+       </And>
+@@ -206,7 +206,6 @@
+     <Directory>X-GNOME-Utilities.directory</Directory>
+     <Include>
+       <Category>X-GNOME-Utilities</Category>
+-      <Filename>eog.desktop</Filename>
+       <Filename>gnome-abrt.desktop</Filename>
+       <Filename>gnome-system-log.desktop</Filename>
+       <Filename>gnome-system-monitor.desktop</Filename>
+@@ -217,6 +216,7 @@
+       <Filename>org.gnome.DejaDup.desktop</Filename>
+       <Filename>org.gnome.Dictionary.desktop</Filename>
+       <Filename>org.gnome.DiskUtility.desktop</Filename>
++      <Filename>org.gnome.eog.desktop</Filename>
+       <Filename>org.gnome.Evince.desktop</Filename>
+       <Filename>org.gnome.FileRoller.desktop</Filename>
+       <Filename>org.gnome.fonts.desktop</Filename>
+-- 
+2.24.1
+

gnome-menus.spec

@@ -2,12 +2,15 @@
 
 Name: gnome-menus
 Version: 3.35.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary:  A menu system for the GNOME project
 
 License: LGPLv2+
 URL: https://gitlab.gnome.org/GNOME/gnome-menus
 Source0: https://download.gnome.org/sources/gnome-menus/3.35/%{name}-%{version}.tar.xz
+# https://gitlab.gnome.org/GNOME/gnome-menus/merge_requests/14
+# Puts eog back to the Utilities submenu
+Patch0: 14.patch
 
 BuildRequires: gawk
 BuildRequires: gettext
@@ -34,6 +37,7 @@ writing applications that use the GNOME menu system.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static \
@@ -71,6 +75,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_datadir}/gir-1.0/GMenu-3.0.gir
 
 %changelog
+* Fri Jan 24 2020 Adam Williamson <awilliam@redhat.com> - 3.35.3-2
+- Backport MR #14 to move eog back to Utilities submenu
+
 * Tue Jan 07 2020 Kalev Lember <klember@redhat.com> - 3.35.3-1
 - Update to 3.35.3