From 7f4e1b9ffdd40e4711fa50ff730d7270c883e7ed Mon Sep 17 00:00:00 2001
From: Tomas Popela <tomas.popela@gmail.com>
Date: Tue, 16 Mar 2021 15:52:53 +0100
Subject: [PATCH] swallow up redhat-menus (backport of rhel-8.2.0 change)  
 Resolves: #1715890

---
 gnome-menus.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnome-menus.spec b/gnome-menus.spec
index ca3d14d..5d1e6ce 100644
--- a/gnome-menus.spec
+++ b/gnome-menus.spec
@@ -2,7 +2,7 @@
 
 Name: gnome-menus
 Version: 3.36.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary:  A menu system for the GNOME project
 
 License: LGPLv2+
@@ -21,6 +21,9 @@ BuildRequires: make
 
 Requires:  redhat-menus
 
+Obsoletes: redhat-menus < 12.0.2-19
+Provides: redhat-menus = 12.0.2-19
+
 %description
 gnome-menus is an implementation of the draft "Desktop
 Menu Specification" from freedesktop.org. This package
@@ -54,6 +57,7 @@ writing applications that use the GNOME menu system.
 %install
 %make_install
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+cp $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/{gnome-,}applications.menu
 
 %find_lang gnome-menus
 
@@ -63,6 +67,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %license COPYING.LIB
 %doc AUTHORS NEWS
 %{_sysconfdir}/xdg/menus/gnome-applications.menu
+%{_sysconfdir}/xdg/menus/applications.menu
 %{_libdir}/lib*.so.*
 %{_datadir}/desktop-directories/*
 %dir %{_libdir}/girepository-1.0
@@ -76,6 +81,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_datadir}/gir-1.0/GMenu-3.0.gir
 
 %changelog
+* Tue Mar 16 2021 Tomas Popela <tpopela@redhat.com> - 3.36.0-5
+- swallow up redhat-menus (backport of rhel-8.2.0 change)
+  Resolves: #1715890
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild