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

Incorporate review feedback

Browse Source 
Resolves: RHEL-65839
This commit is contained in:
Matthias Clasen 2025-01-13 09:26:37 -05:00
parent e6bd75881e
commit 3e703f60d4
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnome-menus-02.patch
View File

@ -1,17 +1,24 @@
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 @@
+++ gnome-menus-3.36.0/layout/gnome-applications.menu 2025-01-13 09:17:55.312850262 -0500
@@ -28,12 +28,16 @@
<Not><Category>System</Category></Not>
<Not><Category>X-GNOME-Utilities</Category></Not>
</And>
+ <Filename>brasero.desktop</Filename>
+ <Filename>gucharmap.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.
Please keep the list alphabetically sorted! -->
- <Filename>gucharmap.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.eog.desktop</Filename>
<Filename>org.gnome.Evince.desktop</Filename>
@ -70,8 +77,11 @@ diff -up gnome-menus-3.36.0/layout/gnome-applications.menu.base gnome-menus-3.36
</Include>
<Exclude>
@@ -212,23 +228,29 @@
<Filename>gucharmap.desktop</Filename>
@@ -209,26 +225,32 @@
<Filename>gnome-abrt.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>
@ -96,6 +106,7 @@ diff -up gnome-menus-3.36.0/layout/gnome-applications.menu.base gnome-menus-3.36
<Filename>yelp.desktop</Filename>
</Include>
+ <Exclude>
+ <Filename>gucharmap.desktop</Filename>
+ <Filename>org.gnome.Characters.desktop</Filename>
+ </Exclude>
</Menu>

10
gnome-menus.spec
View File

@ -2,7 +2,7 @@
Name: gnome-menus
Version: 3.36.0
Release: 14%{?dist}
Release: 15%{?dist}
Summary: A menu system for the GNOME project
License: LGPL-2.0-or-later
@ -10,8 +10,8 @@ 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: gnome-menus-01.patch
Patch1: gnome-menus-02.patch
Patch: gnome-menus-01.patch
Patch: gnome-menus-02.patch
BuildRequires: gawk
BuildRequires: gettext
@ -90,6 +90,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged
%{_datadir}/gir-1.0/GMenu-3.0.gir
%changelog
* Mon Jan 13 2025 Matthias Clasen <mclasen@redhat.com> - 3.36.0-15
- Incorporate review feedback
- Resolves: RHEL-65839
* Sat Jan 11 2025 Matthias Clasen <mclasen@redhat.com> - 3.36.0-14
- Use autosetup
- Rename 14.patch to gnome-menus-01.patch