From 57d5428f271a41f2ab3b5e87f3a63ae97c6d78d9 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Fri, 31 Jan 2025 13:40:22 +0100
Subject: [PATCH] Fix Calculator and Papers

- Calculator was explicitly hidden, fix that
- Papers was in Office and Graphics, but should be in Utilities

Resolves: RHEL-65839
---
 gnome-menus-02.patch | 29 ++++++++++++++++++++---------
 gnome-menus.spec     |  7 ++++++-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/gnome-menus-02.patch b/gnome-menus-02.patch
index eec2307..4d056a4 100644
--- a/gnome-menus-02.patch
+++ b/gnome-menus-02.patch
@@ -1,7 +1,7 @@
 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-13 09:17:55.312850262 -0500
-@@ -28,12 +28,16 @@
+--- gnome-menus-3.36.0/layout/gnome-applications.menu.base	2025-01-31 13:37:31.673424988 +0100
++++ gnome-menus-3.36.0/layout/gnome-applications.menu	2025-01-31 13:51:22.877087465 +0100
+@@ -28,25 +28,33 @@
          <Not><Category>System</Category></Not>
          <Not><Category>X-GNOME-Utilities</Category></Not>
        </And>
@@ -16,16 +16,17 @@ diff -up gnome-menus-3.36.0/layout/gnome-applications.menu.base gnome-menus-3.36
  
             Please keep the list alphabetically sorted! -->
 -      <Filename>gucharmap.desktop</Filename>
-       <Filename>org.gnome.Calculator.desktop</Filename>
+-      <Filename>org.gnome.Calculator.desktop</Filename>
        <Filename>org.gnome.DejaDup.desktop</Filename>
        <Filename>org.gnome.Dictionary.desktop</Filename>
-@@ -41,12 +45,16 @@
+       <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.font-viewer.desktop</Filename>
 +      <Filename>org.gnome.Nautilus.desktop</Filename>
++      <Filename>org.gnome.Papers.desktop</Filename>
        <Filename>org.gnome.Screenshot.desktop</Filename>
        <Filename>org.gnome.seahorse.Application.desktop</Filename>
        <Filename>org.gnome.Terminal.desktop</Filename>
@@ -36,7 +37,7 @@ diff -up gnome-menus-3.36.0/layout/gnome-applications.menu.base gnome-menus-3.36
        <Filename>simple-scan.desktop</Filename>
        <Filename>vinagre.desktop</Filename>
        <Filename>yelp.desktop</Filename>
-@@ -108,11 +116,14 @@
+@@ -108,11 +116,15 @@
      <Include>
        <And>
          <Category>Graphics</Category>
@@ -48,13 +49,14 @@ diff -up gnome-menus-3.36.0/layout/gnome-applications.menu.base gnome-menus-3.36
 +    <Exclude>
 +      <Filename>org.gnome.eog.desktop</Filename>
 +      <Filename>org.gnome.Evince.desktop</Filename>
++      <Filename>org.gnome.Papers.desktop</Filename>
 +      <Filename>simple-scan.desktop</Filename>
 +      <Filename>org.gnome.Loupe.desktop</Filename>
 +    </Exclude>    
    </Menu> <!-- End Graphics -->
  
    <!-- Internet -->
-@@ -153,6 +164,10 @@
+@@ -153,6 +165,10 @@
          <Category>AudioVideo</Category>
        </And>
      </Include>
@@ -65,7 +67,15 @@ diff -up gnome-menus-3.36.0/layout/gnome-applications.menu.base gnome-menus-3.36
    </Menu>   <!-- End Multimedia -->
  
    <!-- Office -->
-@@ -175,9 +190,10 @@
+@@ -164,6 +180,7 @@
+         <Category>Office</Category>
+         <Not><Filename>org.gnome.Dictionary.desktop</Filename></Not>
+         <Not><Filename>org.gnome.Evince.desktop</Filename></Not>
++        <Not><Filename>org.gnome.Papers.desktop</Filename></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Office -->
+@@ -175,9 +192,10 @@
      <Include>
        <And>
          <Category>System</Category>
@@ -77,7 +87,7 @@ diff -up gnome-menus-3.36.0/layout/gnome-applications.menu.base gnome-menus-3.36
      </Include>
  
      <Exclude>
-@@ -209,26 +225,32 @@
+@@ -209,26 +227,33 @@
        <Filename>gnome-abrt.desktop</Filename>
        <Filename>gnome-system-log.desktop</Filename>
        <Filename>gnome-system-monitor.desktop</Filename>
@@ -95,6 +105,7 @@ diff -up gnome-menus-3.36.0/layout/gnome-applications.menu.base gnome-menus-3.36
        <Filename>org.gnome.fonts.desktop</Filename>
 +      <Filename>org.gnome.Loupe.desktop</Filename>
 +      <Filename>org.gnome.Nautilus.desktop</Filename>
++      <Filename>org.gnome.Papers.desktop</Filename>
        <Filename>org.gnome.Screenshot.desktop</Filename>
        <Filename>org.gnome.seahorse.Application.desktop</Filename>
        <Filename>org.gnome.Terminal.desktop</Filename>
diff --git a/gnome-menus.spec b/gnome-menus.spec
index 0d404bc..a17ed08 100644
--- a/gnome-menus.spec
+++ b/gnome-menus.spec
@@ -2,7 +2,7 @@
 
 Name: gnome-menus
 Version: 3.36.0
-Release: 15%{?dist}
+Release: 16%{?dist}
 Summary: A menu system for the GNOME project
 
 License: LGPL-2.0-or-later
@@ -90,6 +90,11 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged
 %{_datadir}/gir-1.0/GMenu-3.0.gir
 
 %changelog
+* Fri Jan 31 2025 Tomas Popela <tpopela@redhat.com> - 3.36.0-16
+- Fix Calculator to be presented
+- Papers should be in Utilities and not in Graphics and Office
+- Resolves: RHEL-65839
+
 * Mon Jan 13 2025 Matthias Clasen <mclasen@redhat.com> - 3.36.0-15
 - Incorporate review feedback
 - Resolves: RHEL-65839