From 8d0f2de62876dda026fddc15e35708592047b0c38ab8259dc5f00d8e0a87f502 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 6 Apr 2018 15:31:46 +0000 Subject: [PATCH] Accepting request 594026 from home:fcrozat:branches:GNOME:Factory - Drop Recommends on caribou, it is no longer needed since GNOME 3.26. - Enable gnome-multimedia pattern on SLE (bsc#1080203). - Recommends gutenprint (bsc#1075136) on SLE. - Improve description, icons and order for GNOME patterns (bsc#1062753, bsc#1080976). - Remove totem-browser-plugin from Recommends, package no longer exists. - Tune main gnome patterns order: first gnome_basic, then gnome_wayland then gnome_x11. gnome_basis doesn't need a order (not visible). - Do not pull in gnome-initial-setup on openSUSE (boo#1086056) - Don't guard gnome pattern with %is_opensuse (bsc#1084155) OBS-URL: https://build.opensuse.org/request/show/594026 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/patterns-gnome?expand=0&rev=32 --- patterns-gnome.changes | 25 +++++++++++++++++++++++++ patterns-gnome.spec | 36 ++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 16 deletions(-) diff --git a/patterns-gnome.changes b/patterns-gnome.changes index cb40384..fb40452 100644 --- a/patterns-gnome.changes +++ b/patterns-gnome.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Apr 6 12:03:45 UTC 2018 - fcrozat@suse.com + +- Drop Recommends on caribou, it is no longer needed since + GNOME 3.26. +- Enable gnome-multimedia pattern on SLE (bsc#1080203). +- Recommends gutenprint (bsc#1075136) on SLE. +- Improve description, icons and order for GNOME patterns + (bsc#1062753, bsc#1080976). +- Remove totem-browser-plugin from Recommends, package no longer + exists. +- Tune main gnome patterns order: first gnome_basic, then + gnome_wayland then gnome_x11. gnome_basis doesn't need a order + (not visible). + +------------------------------------------------------------------- +Fri Apr 6 08:31:11 UTC 2018 - lnussel@suse.de + +- Do not pull in gnome-initial-setup on openSUSE (boo#1086056) + ------------------------------------------------------------------- Fri Apr 6 07:31:11 UTC 2018 - dleuenberger@suse.com @@ -61,6 +81,11 @@ Wed Mar 21 09:18:48 UTC 2018 - tchvatal@suse.com - Recommend also gstreamer-plugins-libav - Drop yast-scanner and yast-tv as both modules were removed +------------------------------------------------------------------- +Mon Mar 12 15:00:01 UTC 2018 - lnussel@suse.de + +- Don't guard gnome pattern with %is_opensuse (bsc#1084155) + ------------------------------------------------------------------- Wed Jan 24 16:00:34 UTC 2018 - fcrozat@suse.com diff --git a/patterns-gnome.spec b/patterns-gnome.spec index 2ebebd0..ef25b89 100644 --- a/patterns-gnome.spec +++ b/patterns-gnome.spec @@ -99,8 +99,8 @@ GNOME development packages. Summary: GNOME Desktop Environment (X11) Group: Metapackages Provides: pattern() = gnome_x11 -Provides: pattern-icon() = pattern-gnome_x11 -Provides: pattern-order() = 1010 +Provides: pattern-icon() = pattern-gnome +Provides: pattern-order() = 1020 Provides: pattern-visible() %if 0%{?is_opensuse} Provides: patterns-openSUSE-gnome = %{version} @@ -148,7 +148,7 @@ Recommends: gnome-contacts Recommends: gnome-control-center-color Recommends: gnome-control-center-goa Recommends: gnome-desktop -%if 0%{?sle_version} +%if !0%{?is_opensuse} Recommends: gnome-initial-setup %endif Recommends: gnote @@ -159,6 +159,10 @@ Recommends: python3-speechd Recommends: speech-dispatcher Recommends: speech-dispatcher-module-espeak +%if !0%{?is_opensuse} +# bsc#1075136 +Recommends: gutenprint +%endif # # Official upstream # @@ -169,8 +173,6 @@ Requires: gnome-user-share # #545263 Requires: seahorse Requires: totem -# bnc#366894 -Recommends: caribou # bsc#1065191 Recommends: pidgin Recommends: evolution @@ -240,7 +242,9 @@ Recommends: NetworkManager-openconnect-gnome %description gnome_x11 The GNOME desktop environment is an intuitive and attractive desktop for users. -This pattern installs components for GNOME to run with X11 technology. +This pattern installs a full featured GNOME desktop environment, including +Office suite, E-Mail client, Web Browser, File Manager, running with X11 +technology. %files gnome_x11 %dir /usr/share/doc/packages/patterns @@ -254,8 +258,10 @@ Summary: GNOME Desktop Environment (Wayland) Group: Metapackages Provides: pattern() = gnome Requires: pattern() = gnome_x11 -Provides: pattern-order() = 2040 +Provides: pattern-order() = 1010 Recommends: gnome-session-wayland +Provides: pattern-icon() = pattern-gnome +Provides: pattern-visible() %description gnome The GNOME desktop environment is an intuitive and attractive desktop for users. @@ -273,7 +279,6 @@ Summary: GNOME Base System Group: Metapackages Provides: pattern() = gnome_basis Provides: pattern-icon() = pattern-gnome -Provides: pattern-order() = 1000 Requires: pattern() = x11 %if 0%{?is_opensuse} Recommends: pattern() = gnome_basis_opt @@ -369,17 +374,17 @@ Base packages for the GNOME desktop environment. ################################################################################ %package gnome_basic %pattern_graphicalenvironments -Summary: GNOME Desktop Environment +Summary: GNOME Desktop Environment (Basic) Group: Metapackages Provides: pattern() = gnome_basic %if !0%{?is_opensuse} Obsoletes: patterns-sles-gnome-basic %endif Provides: pattern-icon() = pattern-gnome -Provides: pattern-order() = 1010 +Provides: pattern-order() = 1000 Provides: pattern-visible() -Requires: pattern() = gnome_basis Requires: pattern() = basesystem +Requires: pattern() = gnome_basis Requires: pattern() = x11 Requires: gsettings-backend-dconf @@ -406,6 +411,8 @@ Recommends: file-roller %description gnome_basic The GNOME desktop environment is an intuitive and attractive desktop for users. +This pattern installs GNOME desktop environment with only essential graphical +applications installed (File Manager, Web Browser). %files gnome_basic %dir %{_docdir}/patterns @@ -600,7 +607,6 @@ GNOME Internet Applications ################################################################################ -%if 0%{?is_opensuse} %package gnome_multimedia %pattern_gnomedesktop Summary: GNOME Multimedia @@ -627,7 +633,6 @@ Recommends: gstreamer-utils # Official upstream # Recommends: totem -Recommends: totem-browser-plugin # # Packages that really make sense # @@ -645,7 +650,6 @@ GNOME Multimedia %files gnome_multimedia %dir /usr/share/doc/packages/patterns /usr/share/doc/packages/patterns/gnome_multimedia.txt -%endif ################################################################################ @@ -801,7 +805,7 @@ Package Management - Graphical Tools %install mkdir -p "%{buildroot}/usr/share/doc/packages/patterns" -for i in gnome gnome_basis gnome_basic gnome_imaging gnome_x11; do +for i in gnome gnome_basis gnome_basic gnome_imaging gnome_x11 gnome_multimedia; do echo "This file marks the pattern $i to be installed." \ >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt" done @@ -809,7 +813,7 @@ done %if 0%{?is_opensuse} for i in devel_gnome gnome_basis_opt \ gnome_games gnome_ide gnome_internet \ - gnome_multimedia gnome_office \ + gnome_office \ gnome_utilities gnome_yast sw_management_gnome; do echo "This file marks the pattern $i to be installed." \ >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt"