From cc8c07f969183a51951feeb58df88b8a4fa04b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 11 Feb 2024 20:13:19 +0100 Subject: [PATCH] Backport F40 changes Resolves: RHEL-30225 --- .gitignore | 3 +++ gnome-shell-extensions.spec | 54 ++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 420cd85..380a92c 100644 --- a/.gitignore +++ b/.gitignore @@ -172,3 +172,6 @@ /gnome-shell-extensions-45.1.tar.xz /gnome-shell-extensions-45.2.tar.xz /gnome-shell-extensions-46.alpha.tar.xz +/gnome-shell-extensions-46.beta.tar.xz +/gnome-shell-extensions-46.rc.tar.xz +/gnome-shell-extensions-46.0.tar.xz diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index e325d3d..a2eff1c 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -6,11 +6,11 @@ %global major_version %%(cut -d "." -f 1 <<<%{tarball_version}) Name: gnome-shell-extensions -Version: 46~alpha +Version: 46.0 Release: %autorelease Summary: Modify and extend GNOME Shell functionality and behavior -License: GPLv2+ +License: GPL-2.0-or-later URL: http://wiki.gnome.org/Projects/GnomeShell/Extensions Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz @@ -43,7 +43,7 @@ Enabled extensions: %package -n %{pkg_prefix}-common Summary: Files common to GNOME Shell Extensions -License: GPLv2+ +License: GPL-2.0-or-later Requires: gnome-shell >= %{min_gs_version} Obsoletes: %{pkg_prefix}-horizontal-workspaces < 40.0~alpha.1-3 @@ -56,7 +56,7 @@ This package provides common data files shared by various extensions. %package -n gnome-classic-session Summary: GNOME "classic" mode session -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-apps-menu = %{version}-%{release} Requires: %{pkg_prefix}-launch-new-instance = %{version}-%{release} Requires: %{pkg_prefix}-places-menu = %{version}-%{release} @@ -68,9 +68,21 @@ This package contains the required components for the GNOME Shell "classic" mode, which aims to provide a GNOME 2-like user interface. +%package -n gnome-classic-session-xsession +Summary: GNOME "classic" mode session on X11 +License: GPL-2.0-or-later +Requires: gnome-classic-session = %{version}-%{release} +# The X11 session is deprecated and eventually will be removed +Provides: deprecated() + +%description -n gnome-classic-session-xsession +This package contains the required components for the GNOME Shell "classic" +mode on X11, which aims to provide a GNOME 2-like user interface. + + %package -n %{pkg_prefix}-apps-menu Summary: Application menu for GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} Requires: gnome-menus @@ -80,7 +92,7 @@ This GNOME Shell extension adds a GNOME 2.x style menu for applications. %package -n %{pkg_prefix}-auto-move-windows Summary: Assign specific workspaces to applications in GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-auto-move-windows @@ -91,7 +103,7 @@ a manner configurable with a GSettings key. %package -n %{pkg_prefix}-drive-menu Summary: Drive status menu for GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-drive-menu @@ -101,7 +113,7 @@ unmounting removable devices. %package -n %{pkg_prefix}-launch-new-instance Summary: Always launch a new application instance for GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-launch-new-instance @@ -111,7 +123,7 @@ launcher to always launch a new application instance. %package -n %{pkg_prefix}-light-style Summary: Use light style in GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-light-style @@ -120,7 +132,7 @@ This GNOME Shell extension changes the default style to light. %package -n %{pkg_prefix}-native-window-placement Summary: Native window placement for GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-native-window-placement @@ -130,7 +142,7 @@ layout in the overview, including a mechanism similar to KDE4. %package -n %{pkg_prefix}-places-menu Summary: Places status menu for GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-places-menu @@ -140,7 +152,7 @@ places in the system. %package -n %{pkg_prefix}-screenshot-window-sizer Summary: Screenshot window sizer for GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-screenshot-window-sizer @@ -150,7 +162,7 @@ screenshots. %package -n %{pkg_prefix}-system-monitor Summary: System monitor for GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-system-monitor @@ -159,7 +171,7 @@ This GNOME Shell extension displays system usage information in the top bar. %package -n %{pkg_prefix}-user-theme Summary: Support for custom themes in GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-user-theme @@ -169,7 +181,7 @@ This GNOME Shell extension enables loading a GNOME Shell theme from %package -n %{pkg_prefix}-window-list Summary: Display a window list at the bottom of the screen in GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-window-list @@ -178,7 +190,7 @@ This GNOME Shell extension displays a window list at the bottom of the screen. %package -n %{pkg_prefix}-windowsNavigator Summary: Support for keyboard selection of windows and workspaces in GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-windowsNavigator @@ -188,7 +200,7 @@ in overlay mode, by pressing the Alt and Ctrl key respectively. %package -n %{pkg_prefix}-workspace-indicator Summary: Workspace indicator for GNOME Shell -License: GPLv2+ +License: GPL-2.0-or-later Requires: %{pkg_prefix}-common = %{version}-%{release} %description -n %{pkg_prefix}-workspace-indicator @@ -218,12 +230,16 @@ workspaces. %files -n gnome-classic-session %{_datadir}/gnome-shell/modes/classic.json -%{_datadir}/xsessions/gnome-classic.desktop -%{_datadir}/xsessions/gnome-classic-xorg.desktop %{_datadir}/wayland-sessions/gnome-classic.desktop %{_datadir}/wayland-sessions/gnome-classic-wayland.desktop %{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.classic.gschema.override + +%files -n gnome-classic-session-xsession +%{_datadir}/xsessions/gnome-classic.desktop +%{_datadir}/xsessions/gnome-classic-xorg.desktop + + %files -n %{pkg_prefix}-apps-menu %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.apps-menu.gschema.xml %{_datadir}/gnome-shell/extensions/apps-menu*/ diff --git a/sources b/sources index b7a5806..7a399c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-shell-extensions-46.alpha.tar.xz) = 9e766eb02d97647c520a8402b66e4987513351fa5e924a8b80359c71398a369e158e158702d0790bad8422a67337a32b805a4228bfe8116a432ed0d76f057d3d +SHA512 (gnome-shell-extensions-46.0.tar.xz) = 1188495684a45919fd191dd866d61dba29ae453d2cfa7ea36e283150e3e2aa45fc5be7407a6858dc592575cd679eaae214b6144912a2453e278d20ecf3c737a3