Accepting request 1295786 from GNOME:Factory

- Explicitly recommends Google Noto Arabic fonts in GNOME
  (bsc#1246323). (forwarded request 1293975 from yfjiang)

OBS-URL: https://build.opensuse.org/request/show/1295786
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patterns-gnome?expand=0&rev=54

patterns-gnome.changes

@@ -1,3 +1,106 @@
+-------------------------------------------------------------------
+Thu Jul 17 02:09:36 UTC 2025 - Yifan Jiang <yfjiang@suse.com>
+
+- Explicitly recommends Google Noto Arabic fonts in GNOME
+  (bsc#1246323).
+
+-------------------------------------------------------------------
+Wed Jul 16 05:54:26 UTC 2025 - Max Lin <mlin@suse.com>
+
+- Drop gnome_yast on Leap 16, code-o-o#leap/features/173
+
+-------------------------------------------------------------------
+Thu Apr 17 15:15:06 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
+
+- Switch to Loupe and Papers for TW.
+
+-------------------------------------------------------------------
+Mon Apr  7 15:08:11 UTC 2025 - Frederic Crozat <fcrozat@suse.com>
+
+- Adaptation for SLES16:
+  * Disable gnome_x11, gnome_multimedia and enable gnome_internet
+    patterns
+  * Always recommends NetworkManager and gnome_internet pattern.
+  * no longer recommends gnome-shell-classic, pidgin, planner, 
+    totem packages and gnome_imaging, office and x11_yast patterns.
+  * switch from gnome-terminal to GNOME Console
+  * switch from gedit to GNOME Text Editor
+  * switch from evince to Papers
+- Hardcode adobe-sourcecodepro and adwaita fonts to ensure
+  always have default fonts installed, when recommends are disabled
+- No longer recommends gnome-desktop
+
+-------------------------------------------------------------------
+Mon Mar 24 15:50:09 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Recommend gnome-console instead of gnome-terminal.
+
+-------------------------------------------------------------------
+Fri Feb 28 07:44:19 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- boo#1238067: Recommend opensuse-welcome by
+  patterns-gnome-gnome_basis: this used to be pulled in by
+  gnome_imaging -> imaging -> x11 -> x11_enhanced -> oS-welcome
+  Since imaging was changed to not require the x11 pattern,
+  opensuse-welcome has been lost in some cases.
+
+-------------------------------------------------------------------
+Wed Feb 26 18:25:07 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Move MozillaFirefox from gnome_basis to gnome_internet. For the
+  end-user this is a NO-OP, as gnome_internet is recommended by
+  gnome_basis anyway, but it's more accurate.
+- Drop recommends of no longer exitsing branding packages:
+  gnome-control-center-branding-openSUSE,
+  gnome-panel-branding-openSUSE, libsocialweb-branding-openSUSE.
+- Lower gdm-branding-openSUSE, gtk2-branding-openSUSE and
+  gtk3-branding-openSUSE from Recommends to Suggests: only use them
+  as hints for the solver, but do not actually trigger
+  installation. This is especially relevant for
+  gtk2-branding-openSUSE. Being recommended means it's
+  auto-installed by default, even if gtk2 would not be needed.
+- Lower totem from Required to Recommended.
+- No longer Recommend totem-browser-plugin, which has been removed
+  from the distro in 2014.
+
+-------------------------------------------------------------------
+Wed Feb 26 13:32:37 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Have pattern gnome_basic recommend pattern() = enhanced_base: most
+  users of a desktop will want those tools. They were pulled in
+  before via the recently removed imaging -> x11 -> enahnced_base.
+  As x11 was removed as a dependency from the desktop-imaging
+  pattern, this was lost.
+
+-------------------------------------------------------------------
+Tue Nov 12 16:57:52 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Replace tracker with tinysparql: tracker was renamed with GNOME
+  47.
+
+-------------------------------------------------------------------
+Tue Nov 12 16:53:39 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Some major overhaul over the GNOME patterns: allow to properly
+  have wayland or X11 decoupled from each other, stepping closer to
+  a wayland-only installation.
+
+-------------------------------------------------------------------
+Thu Nov  7 15:33:57 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Require gnome-session-xsession in the gnome (X11) pattern
+  (boo#1233064).
+
+-------------------------------------------------------------------
+Thu Oct 31 10:06:27 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Drop file-roller Recommends, the built in support in nautilus is
+  sufficient.
+- Change console to gnome-console Recommends: Use the current app
+  name.
+- Drop nautilus-extension-terminal Recommends: nautilus supports
+  gnome-console natively.
+
 -------------------------------------------------------------------
 Tue Mar 26 07:41:43 UTC 2024 - Yifan Jiang <yfjiang@suse.com>
 

patterns-gnome.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package patterns-gnome
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,8 @@
 #
 
 
-%bcond_with betatest
 Name:           patterns-gnome
-Version:        20201210
+Version:        20250310
 Release:        0
 Summary:        Patterns for Installation (Gnome)
 License:        MIT
@@ -34,6 +33,321 @@ not make sense.
 
 This particular package contains all the Gnome patterns.
 
+
+
+
+
+
+
+
+
+################################################################################
+%package gnome
+%pattern_graphicalenvironments
+Summary:        GNOME Desktop Environment (Wayland)
+Group:          Metapackages
+Provides:       pattern() = gnome
+Provides:       pattern-icon() = pattern-gnome-wayland
+Provides:       pattern-order() = 1010
+Provides:       pattern-visible()
+Requires:       gnome-session-wayland
+Requires:       pattern() = gnome_basic
+
+%description gnome
+The GNOME desktop environment is an intuitive and attractive desktop for users.
+This pattern installs components for GNOME to run with Wayland and X11 technologies.
+
+%files gnome
+%dir %{_docdir}/patterns
+%{_docdir}/patterns/gnome.txt
+
+################################################################################
+
+%if 0%{?is_opensuse}
+%package gnome_x11
+%pattern_graphicalenvironments
+Summary:        GNOME Desktop Environment (X11)
+Group:          Metapackages
+Provides:       pattern() = gnome_x11
+Provides:       pattern-icon() = pattern-gnome-xorg
+Provides:       pattern-order() = 1020
+Provides:       pattern-visible()
+Requires:       gnome-session-xsession
+Requires:       pattern() = gnome_basic
+Requires:       pattern() = x11
+
+################################################################################
+
+%description gnome_x11
+The GNOME desktop environment is an intuitive and attractive desktop for users.
+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 %{_docdir}/patterns
+%{_docdir}/patterns/gnome_x11.txt
+%endif
+
+################################################################################
+
+%package gnome_basic
+%pattern_graphicalenvironments
+Summary:        GNOME Desktop Environment (Basic)
+Group:          Metapackages
+Provides:       pattern() = gnome_basic
+Provides:       pattern-icon() = pattern-gnome
+Provides:       pattern-order() = 1000
+Provides:       pattern-visible()
+Requires:       gsettings-backend-dconf
+Requires:       pattern() = basesystem
+Requires:       pattern() = gnome_basis
+Recommends:     pattern() = enhanced_base
+# bsc#1065146
+%if 0%{?sle_version} && 0%{?sle_version} < 16000
+Recommends:     gedit
+%else
+Recommends:     gnome-text-editor
+%endif
+Recommends:     gnome-calculator %dnl bsc#1063156
+Recommends:     gnome-software
+Recommends:     gnome-system-monitor
+Recommends:     gnome-tweaks %dnl bnc#859494 bsc#1065790
+Recommends:     nautilus-share
+Recommends:     pinentry-gnome3
+# bsc#1164858 bsc#1081584
+# - only in Leap and SLE as we don't want to install gnome-packagekit by
+#   default on TW
+%if 0%{?suse_version} != 01600
+Recommends:     gnome-packagekit
+%endif
+%if !0%{?is_opensuse}
+Obsoletes:      patterns-sles-gnome-basic
+%endif
+%if 0%{?is_opensuse}
+Recommends:     pattern() = gnome_games
+Recommends:     pattern() = gnome_utilities
+Recommends:     pattern() = imaging
+Recommends:     pattern() = multimedia
+%endif
+Recommends:     pattern() = gnome_internet
+# #545263
+Requires:       seahorse
+%if 0%{?is_opensuse}
+Recommends:     totem
+Recommends:     pattern() = gnome_imaging
+Recommends:     pattern() = office
+%if 0%{?suse_version} > 1600
+Recommends:     pattern() = x11_yast
+%endif
+%endif
+#
+# Official upstream
+#
+# bijiben == gnome-notes
+# Disable (temp?) gnome-notes while we wait for upstream to fix the now 6 months old bug with it crashing in its search-provider
+#Recommends:     bijiben
+# no longer need to hard require cheese for g-c-c user panel
+Recommends:     cheese
+Recommends:     dconf-editor
+%if 0%{?suse_version} >= 01600
+Recommends:     gnome-papers
+%else
+Recommends:     evince
+%endif
+Recommends:     evolution
+Recommends:     evolution-ews
+Recommends:     gnome-backgrounds
+Recommends:     gnome-bluetooth
+Recommends:     gnome-characters  %dnl bsc#1069699
+Recommends:     gnome-clocks
+Recommends:     gnome-contacts %dnl bsc#1069699
+Recommends:     gnome-control-center-color
+Recommends:     gnome-control-center-goa
+Recommends:     gnome-disk-utility %dnl boo#554954
+Recommends:     gnome-remote-desktop
+Recommends:     nautilus-sendto
+Recommends:     noto-sans-arabic-fonts
+Recommends:     noto-sans-cjk-fonts
+Recommends:     orca
+%if 0%{?suse_version} < 01600 && !0%{?is_opensuse}
+Recommends:     pidgin %dnl bsc#1065191
+Recommends:     planner
+%endif
+Recommends:     python3-speechd
+Recommends:     speech-dispatcher
+Recommends:     systemd-icon-branding
+Recommends:     tinysparql %dnl boo#608156
+Recommends:     zenity
+Suggests:       pattern() = documentation
+%if 0%{?is_opensuse}
+Provides:       patterns-openSUSE-gnome = %{version}
+Obsoletes:      patterns-openSUSE-gnome < %{version}
+%else
+Provides:       patterns-sled-Default
+Obsoletes:      patterns-sled-Default < %{version}
+%endif
+%if 0%{?is_opensuse}
+Recommends:     vinagre
+%else
+Recommends:     remmina
+%endif
+%if !0%{?is_opensuse}
+Recommends:     gnome-initial-setup
+%endif
+%if !0%{?is_opensuse}
+Recommends:     gutenprint %dnl bsc#1075136
+%endif
+#
+# #447627
+%if !0%{?is_opensuse}
+Recommends:     gnome-user-share %dnl bsc#1087222
+%else
+Requires:       gnome-user-share
+%endif
+%if 0%{?is_opensuse}
+#
+# Official upstream
+#
+Recommends:     gnome-console
+Recommends:     baobab
+Recommends:     gcr-viewer
+Recommends:     gnome-characters
+Recommends:     gnome-contacts
+Recommends:     gnome-logs
+Recommends:     gnome-maps
+Recommends:     gnome-system-monitor
+%if 0%{?sle_version} && 0%{?sle_version} < 16000
+Recommends:     gedit
+%else
+Recommends:     gnome-text-editor
+%endif
+#
+# While running a GNOME3 session, it's nice to have the GNOME3 related pinentry
+# for proper gpg2 integration
+#
+Recommends:     pinentry-gnome3
+Recommends:     sushi
+#
+# Packages that really make sense
+#
+# Tool for advanced configuration of printers
+Recommends:     system-config-printer
+Suggests:       gnome-color-manager %dnl bnc#698250
+%else
+Recommends:     NetworkManager-openconnect-gnome
+# bsc#1065148
+Recommends:     NetworkManager-openvpn-gnome
+Recommends:     NetworkManager-pptp-gnome
+Recommends:     desktop-data-SLE-extra
+%endif
+Recommends:     malcontent-control
+# openSUSE welcome is our 'welcome app'
+%if 0%{?is_opensuse}
+Recommends:     opensuse-welcome
+%endif
+
+%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
+%{_docdir}/patterns/gnome_basic.txt
+
+################################################################################
+
+%package gnome_basis
+%pattern_graphicalenvironments
+Summary:        GNOME Base System
+Group:          Metapackages
+Provides:       pattern() = gnome_basis
+Provides:       pattern-icon() = pattern-gnome
+%if 0%{?is_opensuse}
+Provides:       patterns-openSUSE-gnome_basis = %{version}
+Obsoletes:      patterns-openSUSE-gnome_basis < %{version}
+%endif
+Requires:       gdm
+Requires:       gnome-session
+# ensure we have default fonts always installed
+Requires:       adobe-sourcecodepro-fonts
+Requires:       adwaita-fonts
+# from data/COMMON-DESKTOP
+Recommends:     desktop-data
+Recommends:     desktop-file-utils
+#
+# Now the real packages
+#
+# #332596
+Recommends:     gnome-keyring-pam
+# implied by gnome-keyring-pam
+#Recommends:     gnome-keyring
+# implied by gdm
+#Requires: gnome-shell
+#Requires: gnome-settings-daemon
+# implied by gnome-shell
+#Requires:       gnome-control-center
+# Accessability is not an option, and performance issues if its missing (boo#1204564)
+Requires:       at-spi2-core
+%if 0%{?suse_version} < 1600
+# boo#1090117
+Recommends:     gnome-shell-classic
+%endif
+Recommends:     gnome-console
+Recommends:     gnome-extensions
+# bnc#879466
+Recommends:     gnome-user-docs
+Recommends:     gpgme
+# we need something for xdg-su
+Recommends:     libgnomesu
+Recommends:     nautilus
+Recommends:     polkit-default-privs
+
+%if 0%{?suse_version} > 1500
+# Pipewire is the default sound server
+Recommends:     pipewire
+Recommends:     pipewire-pulseaudio
+%else
+# Pulseaudio is the default sound server
+Recommends:     pulseaudio-module-gsettings
+Recommends:     pulseaudio-module-x11
+%endif
+
+# #509829
+Recommends:     xdg-user-dirs-gtk
+Recommends:     yelp
+#
+# Low-level parts that we need
+#
+# bnc#430161
+Recommends:     NetworkManager
+%if 0%{?is_opensuse}
+Recommends:     canberra-gtk-play
+%endif
+%if 0%{?is_opensuse}
+Recommends:     avahi
+#
+# Branding
+#
+# #591535
+Suggests:       gdm-branding-openSUSE
+Suggests:       gio-branding-openSUSE
+Suggests:       gtk3-branding-openSUSE
+Suggests:       hicolor-icon-theme-branding-openSUSE
+%endif
+
+%description gnome_basis
+Base packages for the GNOME desktop environment.
+
+%files gnome_basis
+%dir %{_docdir}/patterns
+%{_docdir}/patterns/gnome_basis.txt
+
+################################################################################
+
+################################################################################
+
 %if 0%{?is_opensuse}
 %package devel_gnome
 %pattern_development
@@ -77,7 +391,7 @@ Recommends:     libsoup-devel
 Recommends:     libwebkitgtk-devel
 Recommends:     libwnck-devel
 Recommends:     pango-devel
-Recommends:     tracker-devel
+Recommends:     tinysparql-devel
 Recommends:     vala
 Recommends:     vte-devel
 Recommends:     yelp-tools
@@ -90,344 +404,6 @@ GNOME development packages.
 %{_docdir}/patterns/devel_gnome.txt
 %endif
 
-%package gnome_x11
-%pattern_graphicalenvironments
-Summary:        GNOME Desktop Environment (X11)
-Group:          Metapackages
-Provides:       pattern() = gnome_x11
-Provides:       pattern-icon() = pattern-gnome-xorg
-Provides:       pattern-order() = 1020
-Provides:       pattern-visible()
-# bsc#1065166
-Requires:       pattern() = gnome_basic
-%if 0%{?is_opensuse}
-Recommends:     pattern() = gnome_games
-Recommends:     pattern() = gnome_internet
-Recommends:     pattern() = gnome_utilities
-Recommends:     pattern() = imaging
-Recommends:     pattern() = multimedia
-%endif
-# #545263
-Requires:       seahorse
-Requires:       totem
-Requires:       xdg-user-dirs-gtk
-Recommends:     pattern() = gnome_imaging
-Recommends:     pattern() = office
-Recommends:     pattern() = x11_yast
-#
-# Official upstream
-#
-# bijiben == gnome-notes
-# Disable (temp?) gnome-notes while we wait for upstream to fix the now 6 months old bug with it crashing in its search-provider
-#Recommends:     bijiben
-# no longer need to hard require cheese for g-c-c user panel
-Recommends:     cheese
-Recommends:     dconf-editor
-Recommends:     evince
-Recommends:     evolution
-Recommends:     evolution-ews
-Recommends:     gnome-backgrounds
-Recommends:     gnome-bluetooth
-# bsc#1069699
-Recommends:     gnome-characters
-Recommends:     gnome-clocks
-# bsc#1069699
-Recommends:     gnome-contacts
-Recommends:     gnome-control-center-color
-Recommends:     gnome-control-center-goa
-Recommends:     gnome-desktop
-# #554954
-Recommends:     gnome-disk-utility
-Recommends:     gnome-remote-desktop
-Recommends:     gpgme
-Recommends:     nautilus-sendto
-Recommends:     noto-sans-cjk-fonts
-Recommends:     orca
-%if 0%{?sle_version} && !0%{?is_opensuse}
-# bsc#1065191
-Recommends:     pidgin
-Recommends:     planner
-%endif
-Recommends:     python3-speechd
-Recommends:     speech-dispatcher
-Recommends:     systemd-icon-branding
-# #608156
-Recommends:     tracker
-Recommends:     tracker-miner-files
-Recommends:     zenity
-Suggests:       pattern() = documentation
-%if 0%{?is_opensuse}
-Provides:       patterns-openSUSE-gnome = %{version}
-Obsoletes:      patterns-openSUSE-gnome < %{version}
-%else
-Provides:       patterns-sled-Default
-Obsoletes:      patterns-sled-Default < %{version}
-%endif
-%if 0%{?is_opensuse}
-Recommends:     vinagre
-%else
-Recommends:     remmina
-%endif
-%if !0%{?is_opensuse}
-Recommends:     gnome-initial-setup
-%endif
-%if !0%{?is_opensuse}
-# bsc#1075136
-Recommends:     gutenprint
-%endif
-#
-# #447627
-%if !0%{?is_opensuse}
-# bsc#1087222
-Recommends:     gnome-user-share
-%else
-Requires:       gnome-user-share
-%endif
-%if 0%{?is_opensuse}
-#
-# Official upstream
-#
-# #544192
-Recommends:     baobab
-Recommends:     file-roller
-Recommends:     gcr-viewer
-Recommends:     gnome-characters
-Recommends:     gnome-contacts
-Recommends:     gnome-logs
-Recommends:     gnome-maps
-Recommends:     gnome-system-monitor
-%if 0%{?sle_version}
-Recommends:     gedit
-%else
-Recommends:     gnome-text-editor
-%endif
-#
-# While running a GNOME3 session, it's nice to have the GNOME3 related pinentry
-# for proper gpg2 integration
-#
-Recommends:     pinentry-gnome3
-Recommends:     sushi
-#
-# Packages that really make sense
-#
-# Tool for advanced configuration of printers
-Recommends:     system-config-printer
-Recommends:     totem-browser-plugin
-Recommends:     tracker-miner-evolution
-# bnc#698250
-Suggests:       gnome-color-manager
-%else
-Recommends:     NetworkManager-openconnect-gnome
-# bsc#1065148
-Recommends:     NetworkManager-openvpn-gnome
-Recommends:     NetworkManager-pptp-gnome
-Recommends:     desktop-data-SLE-extra
-%endif
-Recommends:     malcontent-control
-
-%description gnome_x11
-The GNOME desktop environment is an intuitive and attractive desktop for users.
-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 %{_docdir}/patterns
-%{_docdir}/patterns/gnome_x11.txt
-
-################################################################################
-
-%package gnome
-%pattern_graphicalenvironments
-Summary:        GNOME Desktop Environment (Wayland)
-Group:          Metapackages
-Provides:       pattern() = gnome
-Provides:       pattern-icon() = pattern-gnome-wayland
-Provides:       pattern-order() = 1010
-Provides:       pattern-visible()
-Requires:       pattern() = gnome_x11
-Recommends:     gnome-session-wayland
-
-%description gnome
-The GNOME desktop environment is an intuitive and attractive desktop for users.
-This pattern installs components for GNOME to run with Wayland and X11 technologies.
-
-%files gnome
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/gnome.txt
-
-################################################################################
-
-%package gnome_basis
-%pattern_graphicalenvironments
-Summary:        GNOME Base System
-Group:          Metapackages
-Provides:       pattern() = gnome_basis
-Provides:       pattern-icon() = pattern-gnome
-%if 0%{?is_opensuse}
-Provides:       patterns-openSUSE-gnome_basis = %{version}
-Obsoletes:      patterns-openSUSE-gnome_basis < %{version}
-Recommends:     pattern() = gnome_basis_opt
-%endif
-Requires:       gdm
-Requires:       gnome-session
-Requires:       pattern() = x11
-# from data/COMMON-DESKTOP
-Recommends:     desktop-data
-Recommends:     desktop-file-utils
-#
-# Now the real packages
-#
-# #332596
-Recommends:     gnome-keyring-pam
-# implied by gnome-keyring-pam
-#Recommends:     gnome-keyring
-# implied by gdm
-#Requires: gnome-shell
-#Requires: gnome-settings-daemon
-# implied by gnome-shell
-#Requires:       gnome-control-center
-# Accessability is not an option, and performance issues if its missing (boo#1204564)
-Requires:       at-spi2-core
-# boo#1090117
-Recommends:     gnome-shell-classic
-Recommends:     console
-Recommends:     gnome-extensions
-Recommends:     gnome-terminal
-# bnc#879466
-Recommends:     gnome-user-docs
-Recommends:     gpgme
-# we need something for xdg-su
-Recommends:     libgnomesu
-Recommends:     nautilus
-Recommends:     polkit-default-privs
-
-%if 0%{?suse_version} > 1500
-# Pipewire is the default sound server
-Recommends:     pipewire
-Recommends:     pipewire-pulseaudio
-%else
-# Pulseaudio is the default sound server
-Recommends:     pulseaudio-module-gsettings
-Recommends:     pulseaudio-module-x11
-%endif
-
-# #509829
-Recommends:     xdg-user-dirs-gtk
-Recommends:     yelp
-#
-# Low-level parts that we need
-#
-%if 0%{?is_opensuse}
-# bnc#430161
-Recommends:     NetworkManager
-%endif
-%if 0%{?is_opensuse}
-Recommends:     canberra-gtk-play
-%endif
-%if 0%{?is_opensuse}
-Recommends:     MozillaFirefox
-Recommends:     avahi
-#
-# Branding
-#
-# #591535
-Recommends:     gdm-branding-openSUSE
-Recommends:     gio-branding-openSUSE
-Recommends:     gnome-control-center-branding-openSUSE
-Recommends:     gnome-panel-branding-openSUSE
-Recommends:     gtk2-branding-openSUSE
-Recommends:     gtk3-branding-openSUSE
-Recommends:     hicolor-icon-theme-branding-openSUSE
-Recommends:     libsocialweb-branding-openSUSE
-%endif
-
-%description gnome_basis
-Base packages for the GNOME desktop environment.
-
-%files gnome_basis
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/gnome_basis.txt
-
-################################################################################
-%package gnome_basic
-%pattern_graphicalenvironments
-Summary:        GNOME Desktop Environment (Basic)
-Group:          Metapackages
-Provides:       pattern() = gnome_basic
-Provides:       pattern-icon() = pattern-gnome
-Provides:       pattern-order() = 1000
-Provides:       pattern-visible()
-%if 0%{?is_opensuse}
-Requires:       pattern() = x11
-%else
-Requires:       pattern() = x11_enhanced
-%endif
-Requires:       gsettings-backend-dconf
-Requires:       pattern() = basesystem
-Requires:       pattern() = gnome_basis
-Recommends:     evince
-# bsc#1069699
-Recommends:     file-roller
-# bsc#1065146
-%if 0%{?sle_version}
-Recommends:     gedit
-%else
-Recommends:     gnome-text-editor
-%endif
-# implified by gnome-keyring-pam
-# Recommends:     gnome-keyring
-# bsc#1063156
-Recommends:     gnome-calculator
-Recommends:     gnome-software
-Recommends:     gnome-system-monitor
-# bnc#859494 bsc#1065790
-Recommends:     gnome-tweaks
-Recommends:     nautilus-extension-terminal
-Recommends:     nautilus-share
-Recommends:     pinentry-gnome3
-# bsc#1164858 bsc#1081584
-# - only in Leap and SLE as we don't want to install gnome-packagekit by
-#   default on TW
-%if 0%{?sle_version}
-Recommends:     gnome-packagekit
-%endif
-%if !0%{?is_opensuse}
-Obsoletes:      patterns-sles-gnome-basic
-%endif
-
-%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
-%{_docdir}/patterns/gnome_basic.txt
-
-################################################################################
-
-%if 0%{?is_opensuse}
-%package gnome_basis_opt
-%pattern_graphicalenvironments
-Summary:        GNOME Base System
-Group:          Metapackages
-Provides:       patterns-openSUSE-gnome_basis_opt = %{version}
-Provides:       pattern() = gnome_basis_opt
-Provides:       pattern-extends() = gnome_basis
-Provides:       pattern-icon() = pattern-gnome
-Provides:       pattern-order() = 1420
-Obsoletes:      patterns-openSUSE-gnome_basis_opt < %{version}
-Requires:       pattern() = x11
-
-%description gnome_basis_opt
-Base packages for the GNOME desktop environment.
-
-%files gnome_basis_opt
-%dir %{_docdir}/patterns
-%{_docdir}/patterns/gnome_basis_opt.txt
-%endif
-
 ################################################################################
 
 %if 0%{?is_opensuse}
@@ -513,7 +489,7 @@ Requires:       pattern() = gnome_basis
 #
 # Official upstream
 #
-Recommends:     eog
+Recommends:     loupe
 #
 # Packages that really make sense
 #
@@ -535,7 +511,6 @@ Handling of digital photos and graphics
 
 ################################################################################
 
-%if 0%{?is_opensuse}
 %package gnome_internet
 %pattern_gnomedesktop
 Summary:        GNOME Internet
@@ -550,6 +525,7 @@ Recommends:     NetworkManager-openconnect-gnome
 #
 # Packages that really make sense
 #
+Recommends:     MozillaFirefox
 # bnc#533580
 Recommends:     NetworkManager-openvpn-gnome
 Recommends:     NetworkManager-pptp-gnome
@@ -575,10 +551,10 @@ GNOME Internet Applications
 %files gnome_internet
 %dir %{_docdir}/patterns
 %{_docdir}/patterns/gnome_internet.txt
-%endif
 
 ################################################################################
 
+%if 0%{?is_opensuse}
 %package gnome_multimedia
 %pattern_gnomedesktop
 Summary:        GNOME Multimedia
@@ -622,6 +598,7 @@ GNOME Multimedia
 %files gnome_multimedia
 %dir %{_docdir}/patterns
 %{_docdir}/patterns/gnome_multimedia.txt
+%endif
 
 ################################################################################
 
@@ -680,7 +657,6 @@ Requires:       pattern() = gnome_basis
 #Recommends:     bijiben
 Recommends:     baobab
 Recommends:     cheese
-Recommends:     file-roller
 Recommends:     gdk-pixbuf-thumbnailer
 Recommends:     gnome-calculator
 Recommends:     gnome-characters
@@ -719,7 +695,7 @@ GNOME Utilities
 
 ################################################################################
 
-%if 0%{?is_opensuse}
+ %if 0%{?is_opensuse} && 0%{?suse_version} > 1600
 %package gnome_yast
 %pattern_basetechnologies
 Summary:        YaST GNOME User Interfaces
@@ -756,7 +732,7 @@ Provides:       pattern-icon() = pattern-generic
 Provides:       pattern-order() = 1780
 Obsoletes:      patterns-openSUSE-sw_management_gnome < %{version}
 Requires:       pattern() = sw_management
-Requires:       pattern() = x11
+# gnome-packagekit needed for openQA - and allows fainer grained updates than Software
 Recommends:     gnome-packagekit
 Recommends:     gnome-software
 Supplements:    packageand(patterns-gnome-gnome_basis:patterns-base-sw_management)
@@ -776,16 +752,20 @@ Package Management - Graphical Tools
 %install
 
 mkdir -p "%{buildroot}%{_docdir}/patterns"
-for i in gnome gnome_basis gnome_basic gnome_imaging gnome_x11 gnome_multimedia; do
+for i in gnome gnome_basis gnome_basic gnome_imaging gnome_internet ; do
 	echo "This file marks the pattern $i to be installed." \
 		>"%{buildroot}%{_docdir}/patterns/$i.txt"
 done
 
 %if 0%{?is_opensuse}
-for i in devel_gnome gnome_basis_opt \
+for i in devel_gnome \
-    gnome_games gnome_ide gnome_internet \
+    gnome_games gnome_ide gnome_x11 gnome_multimedia \
     gnome_office \
-    gnome_utilities gnome_yast sw_management_gnome; do
+    gnome_utilities \
+%if 0%{?suse_version} > 1600
+    gnome_yast\
+%endif
+    sw_management_gnome; do
 	echo "This file marks the pattern $i to be installed." \
 		>"%{buildroot}%{_docdir}/patterns/$i.txt"
 done