Compare commits

..

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

@ -1,87 +0,0 @@
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 -->

@ -2,18 +2,15 @@
Name: gnome-menus Name: gnome-menus
Version: 3.36.0 Version: 3.36.0
Release: 9%{?dist} Release: 13%{?dist}
Summary: A menu system for the GNOME project Summary: A menu system for the GNOME project
License: LGPLv2+ License: LGPL-2.0-or-later
URL: https://gitlab.gnome.org/GNOME/gnome-menus 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: 14.patch 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: gawk
BuildRequires: gettext BuildRequires: gettext
@ -22,9 +19,13 @@ BuildRequires: pkgconfig
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
BuildRequires: make BuildRequires: make
Obsoletes: redhat-menus < 12.0.2-20 %if %{defined rhel}
Provides: redhat-menus = 12.0.2-20 Obsoletes: redhat-menus < 12.0.2-24
Conflicts: redhat-menus < 12.0.2-20 Provides: redhat-menus = 12.0.2-24
Conflicts: redhat-menus < 12.0.2-24
%else
Requires: redhat-menus
%endif
%description %description
gnome-menus is an implementation of the draft "Desktop gnome-menus is an implementation of the draft "Desktop
@ -44,7 +45,6 @@ writing applications that use the GNOME menu system.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
%configure --disable-static \ %configure --disable-static \
@ -60,7 +60,10 @@ writing applications that use the GNOME menu system.
%install %install
%make_install %make_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%if %{defined rhel}
cp $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications.menu cp $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications.menu
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged
%endif
%find_lang gnome-menus %find_lang gnome-menus
@ -70,7 +73,10 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications.menu
%license COPYING.LIB %license COPYING.LIB
%doc AUTHORS NEWS %doc AUTHORS NEWS
%{_sysconfdir}/xdg/menus/gnome-applications.menu %{_sysconfdir}/xdg/menus/gnome-applications.menu
%if %{defined rhel}
%{_sysconfdir}/xdg/menus/applications.menu %{_sysconfdir}/xdg/menus/applications.menu
%dir %{_sysconfdir}/xdg/menus/applications-merged
%endif
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%{_datadir}/desktop-directories/* %{_datadir}/desktop-directories/*
%dir %{_libdir}/girepository-1.0 %dir %{_libdir}/girepository-1.0
@ -84,23 +90,33 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications.menu
%{_datadir}/gir-1.0/GMenu-3.0.gir %{_datadir}/gir-1.0/GMenu-3.0.gir
%changelog %changelog
* Wed Apr 17 2024 Ray Strode <rstrode@redhat.com> - 3.36.0-9 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.36.0-13
- Move things around a bit in the menus to be more logical - Bump release for October 2024 mass rebuild:
Related: RHEL-32792 Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.36.0-12
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.36.0-8 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-8
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Related: rhbz#1991688
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.36.0-7 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-7
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Mar 17 2021 Tomas Popela <tpopela@redhat.com> - 3.36.0-6 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-6
- Fix the version of redhat-menus, add Conflicts, remove Requires - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Mar 16 2021 Tomas Popela <tpopela@redhat.com> - 3.36.0-5 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-5
- swallow up redhat-menus (backport of rhel-8.2.0 change) - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Resolves: #1715890
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save