From e6bd75881ef98a3e7c5462c7f97ee0d2f1d76520 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 11 Jan 2025 13:26:19 -0500
Subject: [PATCH] Implement design review

Resolves: RHEL-65839
---
 14.patch => gnome-menus-01.patch |   0
 gnome-menus-02.patch             | 103 +++++++++++++++++++++++++++++++
 gnome-menus.spec                 |  16 +++--
 3 files changed, 114 insertions(+), 5 deletions(-)
 rename 14.patch => gnome-menus-01.patch (100%)
 create mode 100644 gnome-menus-02.patch

diff --git a/14.patch b/gnome-menus-01.patch
similarity index 100%
rename from 14.patch
rename to gnome-menus-01.patch
diff --git a/gnome-menus-02.patch b/gnome-menus-02.patch
new file mode 100644
index 0000000..b0ebb55
--- /dev/null
+++ b/gnome-menus-02.patch
@@ -0,0 +1,103 @@
+diff -up gnome-menus-3.36.0/layout/gnome-applications.menu.base gnome-menus-3.36.0/layout/gnome-applications.menu
+--- gnome-menus-3.36.0/layout/gnome-applications.menu.base	2025-01-11 13:04:02.656862681 -0500
++++ gnome-menus-3.36.0/layout/gnome-applications.menu	2025-01-11 13:04:12.289953947 -0500
+@@ -28,6 +28,10 @@
+         <Not><Category>System</Category></Not>
+         <Not><Category>X-GNOME-Utilities</Category></Not>
+       </And>
++      <Filename>brasero.desktop</Filename>
++      <Filename>org.gnome.Snapshot.desktop</Filename>
++      <Filename>org.gnome.Calculator.desktop</Filename>
++      <Filename>org.gnome.Characters.desktop</Filename>
+     </Include>
+     <Exclude>
+       <!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
+@@ -41,12 +45,16 @@
+       <Filename>org.gnome.eog.desktop</Filename>
+       <Filename>org.gnome.Evince.desktop</Filename>
+       <Filename>org.gnome.FileRoller.desktop</Filename>
++      <Filename>org.gnome.Files.desktop</Filename>
+       <Filename>org.gnome.font-viewer.desktop</Filename>
++      <Filename>org.gnome.Nautilus.desktop</Filename>
+       <Filename>org.gnome.Screenshot.desktop</Filename>
+       <Filename>org.gnome.seahorse.Application.desktop</Filename>
+       <Filename>org.gnome.Terminal.desktop</Filename>
++      <Filename>org.gnome.TextEditor.desktop</Filename>
+       <Filename>org.gnome.tweaks.desktop</Filename>
+       <Filename>org.gnome.Usage.desktop</Filename>
++      <Filename>org.gnome.Extensions.desktop</Filename>
+       <Filename>simple-scan.desktop</Filename>
+       <Filename>vinagre.desktop</Filename>
+       <Filename>yelp.desktop</Filename>
+@@ -108,11 +116,14 @@
+     <Include>
+       <And>
+         <Category>Graphics</Category>
+-        <Not><Filename>org.gnome.eog.desktop</Filename></Not>
+-        <Not><Filename>org.gnome.Evince.desktop</Filename></Not>
+-        <Not><Filename>simple-scan.desktop</Filename></Not>
+       </And>
+     </Include>
++    <Exclude>
++      <Filename>org.gnome.eog.desktop</Filename>
++      <Filename>org.gnome.Evince.desktop</Filename>
++      <Filename>simple-scan.desktop</Filename>
++      <Filename>org.gnome.Loupe.desktop</Filename>
++    </Exclude>    
+   </Menu> <!-- End Graphics -->
+ 
+   <!-- Internet -->
+@@ -153,6 +164,10 @@
+         <Category>AudioVideo</Category>
+       </And>
+     </Include>
++    <Exclude>
++      <Filename>brasero.desktop</Filename>
++      <Filename>org.gnome.Snapshot.desktop</Filename>
++    </Exclude>
+   </Menu>   <!-- End Multimedia -->
+ 
+   <!-- Office -->
+@@ -175,9 +190,10 @@
+     <Include>
+       <And>
+         <Category>System</Category>
+-        <Not><Category>Settings</Category></Not>
+         <Not><Category>X-GNOME-Utilities</Category></Not>
+       </And>
++      <Filename>org.gnome.Settings.desktop</Filename>
++      <Filename>org.gnome.Extensions.desktop</Filename>
+     </Include>
+ 
+     <Exclude>
+@@ -212,23 +228,29 @@
+       <Filename>gucharmap.desktop</Filename>
+       <Filename>nm-connection-editor.desktop</Filename>
+       <Filename>org.gnome.baobab.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.Files.desktop</Filename>
+       <Filename>org.gnome.fonts.desktop</Filename>
++      <Filename>org.gnome.Loupe.desktop</Filename>
++      <Filename>org.gnome.Nautilus.desktop</Filename>
+       <Filename>org.gnome.Screenshot.desktop</Filename>
+       <Filename>org.gnome.seahorse.Application.desktop</Filename>
+       <Filename>org.gnome.Terminal.desktop</Filename>
++      <Filename>org.gnome.TextEditor.desktop</Filename>
+       <Filename>org.gnome.tweaks.desktop</Filename>
+       <Filename>org.gnome.Usage.desktop</Filename>
+       <Filename>simple-scan.desktop</Filename>
+       <Filename>vinagre.desktop</Filename>
+       <Filename>yelp.desktop</Filename>
+     </Include>
++    <Exclude>
++      <Filename>org.gnome.Characters.desktop</Filename>
++    </Exclude>
+   </Menu>
+ 
+   <!-- Other -->
diff --git a/gnome-menus.spec b/gnome-menus.spec
index 0dcd136..99b395d 100644
--- a/gnome-menus.spec
+++ b/gnome-menus.spec
@@ -2,15 +2,16 @@
 
 Name: gnome-menus
 Version: 3.36.0
-Release: 13%{?dist}
-Summary:  A menu system for the GNOME project
+Release: 14%{?dist}
+Summary: A menu system for the GNOME project
 
 License: LGPL-2.0-or-later
 URL: https://gitlab.gnome.org/GNOME/gnome-menus
 Source0: https://download.gnome.org/sources/gnome-menus/3.36/%{name}-%{version}.tar.xz
 # https://gitlab.gnome.org/GNOME/gnome-menus/merge_requests/14
 # Puts eog back to the Utilities submenu
-Patch0: 14.patch
+Patch0: gnome-menus-01.patch
+Patch1: gnome-menus-02.patch
 
 BuildRequires: gawk
 BuildRequires: gettext
@@ -43,8 +44,7 @@ This package provides the necessary development libraries for
 writing applications that use the GNOME menu system.
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 %build
 %configure --disable-static \
@@ -90,6 +90,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged
 %{_datadir}/gir-1.0/GMenu-3.0.gir
 
 %changelog
+* Sat Jan 11 2025 Matthias Clasen <mclasen@redhat.com> - 3.36.0-14
+- Use autosetup
+- Rename 14.patch to gnome-menus-01.patch
+- Rearrange after design review
+- Resolves: RHEL-65839
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.36.0-13
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018