From 5abc1ba066c48d2cfc475e1a36d2c4e652227b835a9b809a6930af68df68fd47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 11 Jan 2020 19:19:33 +0000 Subject: [PATCH] Accepting request 762943 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/762943 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=281 --- gnome-desktop.changes | 10 ++++++++++ gnome-desktop.spec | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gnome-desktop.changes b/gnome-desktop.changes index e5fada7..7c66a73 100644 --- a/gnome-desktop.changes +++ b/gnome-desktop.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jan 10 21:01:21 UTC 2020 - Bjørn Lie + +- No longer recommend gnome-desktop-lang: the lang package has + relevant supplements which pulls it in whenever needed. +- Move /usr/share/locale/en from the -lang package to the main + package: English is installed on all systems. This avoids + gnome-desktop-lang being triggered for installation on + english-only systems. + ------------------------------------------------------------------- Wed Jan 8 17:19:53 UTC 2020 - Bjørn Lie diff --git a/gnome-desktop.spec b/gnome-desktop.spec index ca36c49..724ae81 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -79,7 +79,6 @@ Requires: bubblewrap Requires: gsettings-desktop-schemas # Data files for libgnome-desktop, split in an own package for SLPP compliancy Requires: libgnome-desktop-3_0-common >= %{version} -Recommends: %{name}-lang Provides: %{name} = %{version} Obsoletes: %{name} < %{version} @@ -154,6 +153,7 @@ translation-update-upstream po gnome-desktop %doc %{_datadir}/help/C/fdl/ %doc %{_datadir}/help/C/gpl/ %doc %{_datadir}/help/C/lgpl/ +%{_datadir}/locale/en/ %{_libexecdir}/gnome-rr-debug %files -n typelib-1_0-GnomeDesktop-3_0 @@ -167,6 +167,8 @@ translation-update-upstream po gnome-desktop %doc %{_datadir}/gtk-doc/html/gnome-desktop3/ %files lang -f %{name}-3.0.lang +# english locale should be in the main package +%exclude %{_datadir}/locale/en %files -n gnome-version %dir %{_datadir}/gnome