rpms/gnome-menus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Move things around a bit in the menus to be more logical

Browse Source 
Related: RHEL-32792
This commit is contained in:
Ray Strode 2024-04-17 22:00:50 -04:00
parent b45d5e9026
commit 60525f45a1
2 changed files with 96 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
4.patch Normal file
View File

@ -0,0 +1,87 @@
From f18150d68204f2a23f4874e45363df1112fd1620 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Web, 17 Apr 2024 22:58:24 -0400
Subject: [PATCH] layout: Move menu items around to be more logical
Fixes: https://gitlab.gnome.org/GNOME/gnome-menus/issues/15
---
layout/gnome-applications.menu | 6 +++---
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
@@ -28,6 +28,7 @@
<Not><Category>System</Category></Not>
<Not><Category>X-GNOME-Utilities</Category></Not>
</And>
+ <Filename>org.gnome.Tour.desktop</Filename>
</Include>
<Exclude>
<!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
@@ -40,6 +41,7 @@
<Filename>org.gnome.DiskUtility.desktop</Filename>
<Filename>org.gnome.eog.desktop</Filename>
<Filename>org.gnome.Evince.desktop</Filename>
+ <Filename>org.gnome.Extensions.desktop</Filename>
<Filename>org.gnome.FileRoller.desktop</Filename>
<Filename>org.gnome.font-viewer.desktop</Filename>
<Filename>org.gnome.Screenshot.desktop</Filename>
@@ -178,16 +180,18 @@
<Not><Category>Settings</Category></Not>
<Not><Category>X-GNOME-Utilities</Category></Not>
</And>
+ <Filename>gnome-system-monitor.desktop</Filename>
+ <Filename>org.gnome.baobab.desktop</Filename>
+ <Filename>org.gnome.DiskUtility.desktop</Filename>
+ <Filename>org.gnome.Software.desktop</Filename>
+ <Filename>org.gnome.Usage.desktop</Filename>
</Include>
<Exclude>
<!-- Utilities exclusions -->
<Filename>gnome-abrt.desktop</Filename>
<Filename>gnome-system-log.desktop</Filename>
- <Filename>gnome-system-monitor.desktop</Filename>
- <Filename>org.gnome.baobab.desktop</Filename>
<Filename>org.gnome.Terminal.desktop</Filename>
- <Filename>org.gnome.Usage.desktop</Filename>
</Exclude>
</Menu> <!-- End System Tools -->
@@ -207,28 +211,31 @@
<Include>
<Category>X-GNOME-Utilities</Category>
<Filename>gnome-abrt.desktop</Filename>
+ <Filename>gnome-control-center.desktop</Filename>
<Filename>gnome-system-log.desktop</Filename>
- <Filename>gnome-system-monitor.desktop</Filename>
<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.Extensions.desktop</Filename>
<Filename>org.gnome.FileRoller.desktop</Filename>
<Filename>org.gnome.fonts.desktop</Filename>
<Filename>org.gnome.Screenshot.desktop</Filename>
<Filename>org.gnome.seahorse.Application.desktop</Filename>
<Filename>org.gnome.Terminal.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.baobab.desktop</Filename>
+ <Filename>org.gnome.DiskUtility.desktop</Filename>
+ <Filename>org.gnome.Usage.desktop</Filename>
+ </Exclude>
</Menu>
<!-- Other -->

10
gnome-menus.spec
View File

@ -2,7 +2,7 @@
Name: gnome-menus
Version: 3.36.0
Release: 8%{?dist}
Release: 9%{?dist}
Summary: A menu system for the GNOME project
License: LGPLv2+
@ -11,6 +11,9 @@ Source0: https://download.gnome.org/sources/gnome-menus/3.36/%{name}-%{version}.
# https://gitlab.gnome.org/GNOME/gnome-menus/merge_requests/14
# Puts eog back to the Utilities submenu
Patch0: 14.patch
# https://gitlab.com/redhat/centos-stream/rpms/gnome-menus/-/merge_requests/4
# Move things around a bit to be more logical
Patch1: 4.patch
BuildRequires: gawk
BuildRequires: gettext
@ -41,6 +44,7 @@ writing applications that use the GNOME menu system.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure --disable-static \
@ -80,6 +84,10 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications.menu
%{_datadir}/gir-1.0/GMenu-3.0.gir
%changelog
* Wed Apr 17 2024 Ray Strode <rstrode@redhat.com> - 3.36.0-9
- Move things around a bit in the menus to be more logical
Related: RHEL-32792
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.36.0-8
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688