Incorporate review feedback
Resolves: RHEL-65839
This commit is contained in:
parent
e6bd75881e
commit
3e703f60d4
@ -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
|
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.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
|
+++ gnome-menus-3.36.0/layout/gnome-applications.menu 2025-01-13 09:17:55.312850262 -0500
|
||||||
@@ -28,6 +28,10 @@
|
@@ -28,12 +28,16 @@
|
||||||
<Not><Category>System</Category></Not>
|
<Not><Category>System</Category></Not>
|
||||||
<Not><Category>X-GNOME-Utilities</Category></Not>
|
<Not><Category>X-GNOME-Utilities</Category></Not>
|
||||||
</And>
|
</And>
|
||||||
+ <Filename>brasero.desktop</Filename>
|
+ <Filename>brasero.desktop</Filename>
|
||||||
|
+ <Filename>gucharmap.desktop</Filename>
|
||||||
+ <Filename>org.gnome.Snapshot.desktop</Filename>
|
+ <Filename>org.gnome.Snapshot.desktop</Filename>
|
||||||
+ <Filename>org.gnome.Calculator.desktop</Filename>
|
+ <Filename>org.gnome.Calculator.desktop</Filename>
|
||||||
+ <Filename>org.gnome.Characters.desktop</Filename>
|
+ <Filename>org.gnome.Characters.desktop</Filename>
|
||||||
</Include>
|
</Include>
|
||||||
<Exclude>
|
<Exclude>
|
||||||
<!-- Exclude everything we put in the X-GNOME-Utilities whitelist.
|
<!-- 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 @@
|
@@ -41,12 +45,16 @@
|
||||||
<Filename>org.gnome.eog.desktop</Filename>
|
<Filename>org.gnome.eog.desktop</Filename>
|
||||||
<Filename>org.gnome.Evince.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>
|
</Include>
|
||||||
|
|
||||||
<Exclude>
|
<Exclude>
|
||||||
@@ -212,23 +228,29 @@
|
@@ -209,26 +225,32 @@
|
||||||
<Filename>gucharmap.desktop</Filename>
|
<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>nm-connection-editor.desktop</Filename>
|
||||||
<Filename>org.gnome.baobab.desktop</Filename>
|
<Filename>org.gnome.baobab.desktop</Filename>
|
||||||
- <Filename>org.gnome.Calculator.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>
|
<Filename>yelp.desktop</Filename>
|
||||||
</Include>
|
</Include>
|
||||||
+ <Exclude>
|
+ <Exclude>
|
||||||
|
+ <Filename>gucharmap.desktop</Filename>
|
||||||
+ <Filename>org.gnome.Characters.desktop</Filename>
|
+ <Filename>org.gnome.Characters.desktop</Filename>
|
||||||
+ </Exclude>
|
+ </Exclude>
|
||||||
</Menu>
|
</Menu>
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: gnome-menus
|
Name: gnome-menus
|
||||||
Version: 3.36.0
|
Version: 3.36.0
|
||||||
Release: 14%{?dist}
|
Release: 15%{?dist}
|
||||||
Summary: A menu system for the GNOME project
|
Summary: A menu system for the GNOME project
|
||||||
|
|
||||||
License: LGPL-2.0-or-later
|
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
|
Source0: https://download.gnome.org/sources/gnome-menus/3.36/%{name}-%{version}.tar.xz
|
||||||
# https://gitlab.gnome.org/GNOME/gnome-menus/merge_requests/14
|
# https://gitlab.gnome.org/GNOME/gnome-menus/merge_requests/14
|
||||||
# Puts eog back to the Utilities submenu
|
# Puts eog back to the Utilities submenu
|
||||||
Patch0: gnome-menus-01.patch
|
Patch: gnome-menus-01.patch
|
||||||
Patch1: gnome-menus-02.patch
|
Patch: gnome-menus-02.patch
|
||||||
|
|
||||||
BuildRequires: gawk
|
BuildRequires: gawk
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
@ -90,6 +90,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged
|
|||||||
%{_datadir}/gir-1.0/GMenu-3.0.gir
|
%{_datadir}/gir-1.0/GMenu-3.0.gir
|
||||||
|
|
||||||
%changelog
|
%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
|
* Sat Jan 11 2025 Matthias Clasen <mclasen@redhat.com> - 3.36.0-14
|
||||||
- Use autosetup
|
- Use autosetup
|
||||||
- Rename 14.patch to gnome-menus-01.patch
|
- Rename 14.patch to gnome-menus-01.patch
|
||||||
|
Loading…
Reference in New Issue
Block a user