From 8a33afe667b8db5ad661436fec671f8147f1d038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 2 Jan 2022 00:00:33 +0100
Subject: [PATCH] Rename gnome-menus3 -> gnome-menus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../{gnome-menus3_3.36.0.bb => gnome-menus_3.36.0.bb}           | 2 --
 meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.38.0.bb      | 2 +-
 .../recipes-support/packagegroups/packagegroup-gnome-desktop.bb | 2 +-
 .../gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb | 2 +-
 meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb             | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-menus/{gnome-menus3_3.36.0.bb => gnome-menus_3.36.0.bb} (96%)

diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.36.0.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb
similarity index 96%
rename from meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.36.0.bb
rename to meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb
index 2255ff00db..c58229879c 100644
--- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.36.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb
@@ -10,8 +10,6 @@ inherit features_check gnomebase gettext pkgconfig gobject-introspection upstrea
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-BPN = "gnome-menus"
-
 SRC_URI[archive.md5sum] = "a8fd71fcf31a87fc799d80396a526829"
 SRC_URI[archive.sha256sum] = "d9348f38bde956fc32753b28c1cde19c175bfdbf1f4d5b06003b3aa09153bb1f"
 
diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.38.0.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.38.0.bb
index 1a3c20fbc0..ea06a81beb 100644
--- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.38.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.38.0.bb
@@ -12,7 +12,7 @@ DEPENDS += " \
     polkit \
     dconf \
     libgweather \
-    gnome-menus3 \
+    gnome-menus \
     gnome-desktop \
     gdm \
 "
diff --git a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb
index abf1d24c3f..a74739aaec 100644
--- a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb
+++ b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb
@@ -16,7 +16,7 @@ RDEPENDS:${PN} = " \
     gnome-desktop \
     gnome-flashback \
     gnome-keyring \
-    gnome-menus3 \
+    gnome-menus \
     gnome-session \
     gnome-settings-daemon \
     gnome-shell \
diff --git a/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb b/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb
index c85293aa5c..52dab107b5 100644
--- a/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb
+++ b/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb
@@ -5,7 +5,7 @@ SECTION = "x11/wm"
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
 DEPENDS = " \
-    gnome-menus3 \
+    gnome-menus \
     glib-2.0 \
 "
 PV = "0.3"
diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb
index a939250123..4aa50d50b2 100644
--- a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb
+++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb
@@ -34,7 +34,7 @@ RDEPENDS:${PN} += " \
     gtk+3 \
     gtksourceview3 \
     python3-pygobject \
-    gnome-menus3 \
+    gnome-menus \
     python3-unixadmin \
     python3-psutil \
 "