From 1f2661b06cff3a6dff6d3821af9fc5103c8101e2e14ff27a03dae54c138c1465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 31 May 2019 15:12:02 +0000 Subject: [PATCH] Accepting request 706691 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/706691 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=190 --- gnome-shell-extensions.changes | 8 ++++++++ gnome-shell-extensions.spec | 22 ++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index ac8cd18..41ba46d 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 29 09:42:28 UTC 2019 - Yifan Jiang + +- Split the architecture dependent session file to a new package + gnome-shell-classic-session required by gnome-shell-classic. +- Move BuildArch: noarch to subpackages to enable %ifarch macro + (bsc#1129412). + ------------------------------------------------------------------- Thu Apr 18 11:16:42 UTC 2019 - Dominique Leuenberger diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 5a11c54..8755915 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -53,7 +53,6 @@ BuildRequires: gobject-introspection BuildRequires: meson >= 0.44.0 BuildRequires: sassc BuildRequires: translation-update-upstream -BuildArch: noarch %description GNOME Shell Extensions is a collection of extensions providing @@ -79,6 +78,7 @@ Obsoletes: gnome-shell-extension-windows-navigator < %{version} Obsoletes: gnome-shell-extension-workspace-indicator < %{version} Obsoletes: gnome-shell-extension-xrandr-indicator < %{version} Obsoletes: gnome-shell-extensions < %{version} +BuildArch: noarch %description common This package provides files common to several GNOME Shell Extensions @@ -86,14 +86,24 @@ This package provides files common to several GNOME Shell Extensions %package -n gnome-shell-classic Summary: A collection of extensions for Gnome-shell classic Group: System/GUI/GNOME +Requires: gnome-shell-classic-session Recommends: %{name}-common-lang +BuildArch: noarch %description -n gnome-shell-classic This GNOME Shell extension adds a power off item in the status menu, and provides the ability to hibernate. -This package provides the extensions required to switch to gnome-shell classic -and also installs the required session files. +This package provides the extensions required to switch to +gnome-shell classic. + +%package -n gnome-shell-classic-session +Summary: A collection of extensions for Gnome-shell classic +Group: System/GUI/GNOME + +%description -n gnome-shell-classic-session +This packages provides architecture dependent session files to +gnome-shell classic. %lang_package -n %{name}-common @@ -178,7 +188,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.window-list.gschema.xml %{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.sle-classic.gschema.override -%{_datadir}/gnome-session/sessions/gnome-classic.session %dir %{_datadir}/gnome-shell/extensions %{_datadir}/gnome-shell/extensions/apps-menu@gnome-shell-extensions.gcampax.github.com/ %{_datadir}/gnome-shell/extensions/launch-new-instance@gnome-shell-extensions.gcampax.github.com/ @@ -211,6 +220,11 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop %endif +%files -n gnome-shell-classic-session +%defattr(-,root,root) +%doc COPYING +%{_datadir}/gnome-session/sessions/gnome-classic.session + %files common-lang -f %{name}.lang %changelog