Accepting request 580939 from home:fcrozat:branches:GNOME:Factory

- Split gnome pattern into gnome_x11 and gnome (wayland) patterns
  to implement SLED system roles (FATE#324198).
- Add gnome-user-share as requires (bsc#1075321).

- Add deja-dup, gnome-characters and gnome-contacts are Recommends
  to gnome pattern (SLE only) (bsc#1069699).
- Add brasero and file-roller as Recommends to gnome_basic pattern
  (SLE only) (bsc#1069699, bsc#1065945).

- Fix requires in gnome_basic pattern, it MUST be gnome_basic, not
  gnome-basic (bsc#1066771), pattern name MUST NOT contain -, only
  _ is allowed.

- Fix requires in gnome pattern on SLE, should be gnome-basic not
  gnome_basic.

- Stop requiring yast2-control-center-gnome in gnome pattern, use
  x11_yast patterns as Recommends instead (bsc#1062733).
- Remove gstreamer as Recommends, it is pulled by package
  dependencies.
- Stop provides/obsoletes openSUSE patterns when building on SLE.
- On SLE, gnome pattern requires gnome_basic and not just
  gnome_basis (bsc#1065166).
- No longer requires cheese for g-c-c user panel, only recommends.
- Switch to pidgin on SLE (bsc#1065191).
- Recommends gnome-documents on SLE gnome pattern.
- No longer recommends tracker-gui, it no longer exists.
- Recommends NetworkManager-openvpn/pptp/openconnect-gnome on SLE
  gnome pattern (bsc#1065148).
- Disable some implicit requires

OBS-URL: https://build.opensuse.org/request/show/580939
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/patterns-gnome?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2018-03-09 10:50:26 +00:00 committed by Git OBS Bridge
parent 2c6f96dfc3
commit 20198ef0f4
2 changed files with 346 additions and 90 deletions

View File

@ -1,3 +1,81 @@
-------------------------------------------------------------------
Wed Jan 24 16:00:34 UTC 2018 - fcrozat@suse.com
- Split gnome pattern into gnome_x11 and gnome (wayland) patterns
to implement SLED system roles (FATE#324198).
- Add gnome-user-share as requires (bsc#1075321).
-------------------------------------------------------------------
Thu Dec 7 14:00:16 UTC 2017 - fcrozat@suse.com
- Add deja-dup, gnome-characters and gnome-contacts are Recommends
to gnome pattern (SLE only) (bsc#1069699).
- Add brasero and file-roller as Recommends to gnome_basic pattern
(SLE only) (bsc#1069699, bsc#1065945).
-------------------------------------------------------------------
Fri Nov 10 09:12:11 UTC 2017 - fcrozat@suse.com
- Fix requires in gnome_basic pattern, it MUST be gnome_basic, not
gnome-basic (bsc#1066771), pattern name MUST NOT contain -, only
_ is allowed.
-------------------------------------------------------------------
Fri Nov 3 13:17:32 UTC 2017 - fcrozat@suse.com
- Fix requires in gnome pattern on SLE, should be gnome-basic not
gnome_basic.
-------------------------------------------------------------------
Tue Oct 31 16:51:41 UTC 2017 - fcrozat@suse.com
- Stop requiring yast2-control-center-gnome in gnome pattern, use
x11_yast patterns as Recommends instead (bsc#1062733).
- Remove gstreamer as Recommends, it is pulled by package
dependencies.
- Stop provides/obsoletes openSUSE patterns when building on SLE.
- On SLE, gnome pattern requires gnome_basic and not just
gnome_basis (bsc#1065166).
- No longer requires cheese for g-c-c user panel, only recommends.
- Switch to pidgin on SLE (bsc#1065191).
- Recommends gnome-documents on SLE gnome pattern.
- No longer recommends tracker-gui, it no longer exists.
- Recommends NetworkManager-openvpn/pptp/openconnect-gnome on SLE
gnome pattern (bsc#1065148).
- Disable some implicit requires
(gnome-shell/gnome-settings-daemon/gnome-control-center) when gdm
is requires.
- Massive cleanup on gnome_basis pattern, dropping obsolete
package dependencies.
- Add gnome_basic pattern, installing a basic GNOME desktop and
application, with SLES as a use case.
-------------------------------------------------------------------
Tue Oct 17 09:17:16 UTC 2017 - sflees@suse.de
- evince should be included on SLE (bsc#1063397)
-------------------------------------------------------------------
Tue Oct 10 08:37:32 UTC 2017 - fcrozat@suse.com
- Do not requires x11_base pattern, it doesn't exist anymore and
gnome_basis as requirement is enough.
-------------------------------------------------------------------
Mon Oct 9 06:03:44 UTC 2017 - sflees@suse.de
- base pattern now obsoletes and provides Default to make SLE-12
upgrades smoother (bsc#1062164)
-------------------------------------------------------------------
Thu Oct 5 15:10:41 UTC 2017 - fcrozat@suse.com
- x11_base is required instead of desktop_base and enhanced_base for
gnome pattern.
- Replace vinagre with Remmina and drop gftp (unmaintained
upstream).
- Recommends gnome-session-wayland (bsc#1060638).
-------------------------------------------------------------------
Thu Oct 5 10:36:54 UTC 2017 - aplazas@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package patterns-gnome
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -38,6 +38,7 @@ This particular package contains all the Gnome patterns.
################################################################################
%if 0%{?is_opensuse}
%package devel_gnome
%pattern_development
Summary: GNOME Development
@ -96,27 +97,109 @@ GNOME development packages.
%files devel_gnome
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/devel_gnome.txt
%endif
################################################################################
%package gnome
%package gnome_x11
%pattern_graphicalenvironments
Summary: GNOME Desktop Environment
Summary: GNOME Desktop Environment (X11)
Group: Metapackages
Provides: pattern() = gnome
Provides: pattern-icon() = pattern-gnome
Provides: pattern() = gnome_x11
Provides: pattern-icon() = pattern-gnome_x11
Provides: pattern-order() = 1010
Provides: pattern-visible()
Requires: pattern() = gnome_basis
%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}
Requires: pattern() = gnome_basis
%else
# bsc#1065166
Requires: pattern() = gnome_basic
%endif
Recommends: pattern() = x11_yast
Recommends: pattern() = gnome_imaging
Recommends: pattern() = office
Suggests: pattern() = documentation
%if 0%{?is_opensuse}
Recommends: pattern() = games
Recommends: pattern() = imaging
Recommends: pattern() = gnome_admin
Recommends: pattern() = gnome_internet
Recommends: pattern() = multimedia
Recommends: pattern() = office
Recommends: pattern() = gnome_utilities
%endif
# These were not in the tumbleweed pattern
Requires: gnome-packagekit
Requires: remmina
Requires: xdg-user-dirs-gtk
Recommends: amavisd-new
Recommends: dconf-editor
# bsc#1069699
Recommends: deja-dup
Recommends: evince
Recommends: evolution-ews
Recommends: gimp
# bsc#1069699
Recommends: gnome-characters
# bsc#1069699
Recommends: gnome-contacts
Recommends: gnome-control-center-color
Recommends: gnome-control-center-goa
Recommends: gnome-desktop
Recommends: gnome-icon-theme
Recommends: gnome-initial-setup
Recommends: gnome-menus
Recommends: gnote
Recommends: gpgme
Recommends: nautilus-eiciel
Recommends: noto-sans-cjk-fonts
Recommends: python3-speechd
Recommends: speech-dispatcher
Recommends: speech-dispatcher-module-espeak
#
# Official upstream
#
# no longer need to hard require cheese for g-c-c user panel
Recommends: cheese
# #447627
Requires: gnome-user-share
# #545263
Requires: seahorse
Requires: totem
Requires: vino
# bnc#366894
Recommends: caribou
# #594593
%if 0%{?is_opensuse}
Recommends: empathy
%else
# bsc#1065191
Recommends: pidgin
%endif
Recommends: evolution
Recommends: gnome-clocks
# #554954
Recommends: gnome-disk-utility
Recommends: gnome-documents
# #399801
Recommends: mousetweaks
Recommends: nautilus-sendto
Recommends: orca
Recommends: planner
# #608156
Recommends: tracker
Recommends: tracker-miner-files
Recommends: zenity
%if 0%{?is_opensuse}
#
# Official upstream
#
@ -125,52 +208,26 @@ Recommends: baobab
Recommends: bijiben
# #302492
Suggests: brasero
# bnc#366894
Recommends: caribou
Recommends: cheese
# #594593
Recommends: empathy
Recommends: eog
Recommends: evince
Recommends: evolution
Recommends: file-roller
Recommends: gcr-viewer
Recommends: gedit
Recommends: gnome-bluetooth
Recommends: gnome-calculator
Recommends: gnome-characters
Recommends: gnome-contacts
Recommends: gnome-clocks
Recommends: gnome-dictionary
Recommends: gnome-documents
# #554954
Recommends: gnome-disk-utility
Recommends: gnome-font-viewer
Recommends: gnome-logs
Recommends: gnome-maps
Recommends: gnome-screenshot
Recommends: gnome-system-monitor
# #447627
Recommends: gnome-user-share
# #399801
Recommends: mousetweaks
Recommends: nautilus-sendto
Recommends: orca
# #545263
Recommends: seahorse
Recommends: sushi
Recommends: totem
Recommends: totem-browser-plugin
Recommends: vino
Recommends: zenity
#
# Packages that really make sense
#
# Tool for advanced configuration of printers
Recommends: system-config-printer
# #608156
Recommends: tracker
Recommends: tracker-gui
Recommends: tracker-miner-evolution
#
# Telepathy connection managers
@ -190,9 +247,40 @@ Suggests: gconf-editor
Suggests: gnome-backgrounds
# bnc#698250
Suggests: gnome-color-manager
Recommends: gnome-menus-branding-openSUSE
%else
# This is NetworkManager-applet in tumbleweed
Recommends: NetworkManager-gnome
Recommends: desktop-data-SLE-extra
Recommends: gnome-menus-branding-SLE
# bsc#1065148
Recommends: NetworkManager-openvpn-gnome
Recommends: NetworkManager-pptp-gnome
Recommends: NetworkManager-openconnect-gnome
%endif
%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.
%files gnome_x11
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_x11.txt
################################################################################
%package gnome
%pattern_gnomedesktop
Summary: GNOME Desktop Environment (Wayland)
Group: Metapackages
Provides: pattern() = gnome
Requires: pattern() = gnome_x11
Provides: pattern-order() = 2040
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 /usr/share/doc/packages/patterns
@ -200,6 +288,7 @@ The GNOME desktop environment is an intuitive and attractive desktop for users.
################################################################################
%if 0%{?is_opensuse}
%package gnome_admin
%pattern_gnomedesktop
Summary: GNOME Administration Tools
@ -221,6 +310,7 @@ Administration Tools e.g. for desktop lockdown
%files gnome_admin
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_admin.txt
%endif
################################################################################
@ -232,12 +322,20 @@ 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
Provides: patterns-openSUSE-gnome_basis = %{version}
Obsoletes: patterns-openSUSE-gnome_basis < %{version}
%endif
Requires: gdm
Requires: gnome-session
# implied by gdm
#Requires: gnome-shell
#Requires: gnome-settings-daemon
# implied by gnome-shell
#Requires: gnome-control-center
#
# Default sessions
# - Put in Recommends for now, to make sure the livecd will always build; but
@ -247,22 +345,57 @@ Requires: gnome-session
# somehow a bit usable
#
Recommends: gnome-session-default-session
Recommends: gnome-session-fallback-session
# default
Recommends: gnome-settings-daemon
Recommends: gnome-shell
#
# Low-level parts that we need
#
%if 0%{is_opensuse}
# bnc#430161
Recommends: NetworkManager
Recommends: dbus-1-x11
Recommends: NetworkManager-applet
%endif
Recommends: desktop-file-utils
Recommends: gpg2
Recommends: gpgme
Recommends: polkit-default-privs
Recommends: samba
Recommends: susehelp
#
# Now the real packages
#
# #332596
Recommends: gnome-keyring-pam
%if 0%{is_opensuse}
Recommends: canberra-gtk-play
%endif
# bnc#879466
Recommends: gnome-user-docs
# implied by gnome-keyring-pam
#Recommends: gnome-keyring
# FIXME not sure gnome-menus is really needed
Recommends: gnome-menus
Recommends: gnome-power-manager
Recommends: gnome-terminal
Recommends: nautilus
Recommends: yelp
# Pulseaudio is the default sound server
%if 0%{is_opensuse}
Recommends: pulseaudio-module-bluetooth
Recommends: pulseaudio-module-lirc
Recommends: pulseaudio-module-zeroconf
%endif
Recommends: pulseaudio-module-gconf
Recommends: pulseaudio-module-x11
# #509829
Recommends: xdg-user-dirs-gtk
# we need something for xdg-su
Recommends: libgnomesu
# from data/COMMON-DESKTOP
Recommends: google-droid-fonts
Recommends: desktop-data
%if 0%{is_opensuse}
Recommends: MozillaFirefox
Recommends: avahi
# metalink downloader
Suggests: aria2
#
# Branding
#
@ -277,49 +410,7 @@ Recommends: gtk2-branding-openSUSE
Recommends: gtk3-branding-openSUSE
Recommends: hicolor-icon-theme-branding-openSUSE
Recommends: libsocialweb-branding-openSUSE
Recommends: desktop-branding
#
# Now the real packages
#
# #332596
Recommends: gnome-keyring-pam
Recommends: at-spi2-core
Recommends: canberra-gtk-play
Recommends: gnome-control-center
Recommends: gnome-user-docs
Recommends: gnome-keyring
Recommends: gnome-menus
Recommends: gnome-power-manager
Recommends: gnome-screensaver
Recommends: gnome-terminal
Recommends: nautilus
Recommends: NetworkManager-applet
Recommends: shared-mime-info
Recommends: xkeyboard-config
Recommends: yelp
# Pulseaudio is the default sound server
Recommends: pulseaudio-module-bluetooth
Recommends: pulseaudio-module-gconf
Recommends: pulseaudio-module-lirc
Recommends: pulseaudio-module-x11
Recommends: pulseaudio-module-zeroconf
Recommends: pulseaudio-utils
# #509829
Recommends: xdg-user-dirs-gtk
# we need something for xdg-su
Recommends: libgnomesu
# from data/COMMON-DESKTOP
Recommends: google-droid-fonts
Recommends: MozillaFirefox
Recommends: desktop-data-openSUSE
Recommends: avahi
# bnc#508120
Recommends: xdg-user-dirs
# bnc#598884
Suggests: moonlight-plugin
# metalink downloader
Suggests: aria2
%endif
%description gnome_basis
Base packages for the GNOME desktop environment.
@ -329,7 +420,57 @@ Base packages for the GNOME desktop environment.
/usr/share/doc/packages/patterns/gnome_basis.txt
################################################################################
%package gnome_basic
%pattern_graphicalenvironments
Summary: GNOME Desktop Environment
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-visible()
# TEST
Requires: pattern() = gnome_basis
# ENDTEST
Requires: pattern() = basesystem
Requires: pattern() = x11_enhanced
Requires: gsettings-backend-dconf
# bsc#1065945
Recommends: brasero
Recommends: evince
# bsc#1065146
Recommends: gedit
Recommends: gnome-shell-classic
# implified by gnome-keyring-pam
# Recommends: gnome-keyring
# bsc#1063156
Recommends: gnome-calculator
Recommends: gnome-software
Recommends: gconf-editor
Recommends: gnome-system-monitor
# bnc#859494 bsc#1065790
Recommends: gnome-tweak-tool
Recommends: nautilus-extension-terminal
Recommends: nautilus-share
Recommends: pinentry-gnome3
Recommends: vino
# bsc#1069699
Recommends: file-roller
%description gnome_basic
The GNOME desktop environment is an intuitive and attractive desktop for users.
%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
@ -359,9 +500,11 @@ Base packages for the GNOME desktop environment.
%files gnome_basis_opt
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_basis_opt.txt
%endif
################################################################################
%if 0%{?is_opensuse}
%package gnome_games
%pattern_gnomedesktop
Summary: GNOME Games
@ -392,9 +535,11 @@ GNOME Games
%files gnome_games
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_games.txt
%endif
################################################################################
%if 0%{?is_opensuse}
%package gnome_ide
%pattern_gnomedesktop
Summary: GNOME Integrated Development Environment
@ -429,6 +574,7 @@ Development under GNOME
%files gnome_ide
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_ide.txt
%endif
################################################################################
@ -443,8 +589,10 @@ Provides: pattern-order() = 2140
Supplements: packageand(patterns-gnome-gnome:patterns-desktop-imaging)
Requires: pattern() = gnome_basis
Recommends: pattern() = gnome_imaging_opt
%if 0%{?is_opensuse}
Provides: patterns-openSUSE-gnome_imaging = %{version}
Obsoletes: patterns-openSUSE-gnome_imaging < %{version}
%endif
# from data/GNOME-IMAGE
#
# Official upstream
@ -455,7 +603,10 @@ Recommends: eog
#
Recommends: gnome-photos
Recommends: simple-scan
Recommends: inkscape
%if 0%{?is_opensuse}
Suggests: f-spot
%endif
%description gnome_imaging
Handling of digital photos and graphics
@ -466,6 +617,7 @@ Handling of digital photos and graphics
################################################################################
%if 0%{?is_opensuse}
%package gnome_imaging_opt
%pattern_gnomedesktop
Summary: GNOME Graphics
@ -479,7 +631,6 @@ Requires: pattern() = gnome_basis
Provides: patterns-openSUSE-gnome_imaging_opt = %{version}
Obsoletes: patterns-openSUSE-gnome_imaging_opt < %{version}
# from data/GNOME-IMAGE-OPT
Suggests: inkscape
Suggests: dia
Suggests: gthumb
@ -489,9 +640,11 @@ Handling of digital photos and graphics
%files gnome_imaging_opt
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_imaging_opt.txt
%endif
################################################################################
%if 0%{?is_opensuse}
%package gnome_internet
%pattern_gnomedesktop
Summary: GNOME Internet
@ -538,6 +691,7 @@ GNOME Internet Applications
%files gnome_internet
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_internet.txt
%endif
################################################################################
@ -551,8 +705,10 @@ Provides: pattern-icon() = pattern-generic
Provides: pattern-order() = 2160
Supplements: packageand(patterns-gnome-gnome:patterns-desktop-laptop)
Requires: pattern() = gnome_basis
%if 0%{?is_opensuse}
Provides: patterns-openSUSE-gnome_laptop = %{version}
Obsoletes: patterns-openSUSE-gnome_laptop < %{version}
%endif
# from data/GNOME-LAPTOP
Recommends: gnome-bluetooth
Suggests: xournal
@ -566,6 +722,7 @@ GNOME Tools designed specifically for use with laptop computers.
################################################################################
%if 0%{?is_opensuse}
%package gnome_multimedia
%pattern_gnomedesktop
Summary: GNOME Multimedia
@ -611,9 +768,11 @@ GNOME Multimedia
%files gnome_multimedia
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_multimedia.txt
%endif
################################################################################
%if 0%{?is_opensuse}
%package gnome_multimedia_opt
%pattern_gnomedesktop
Summary: GNOME Multimedia
@ -633,9 +792,11 @@ GNOME Multimedia
%files gnome_multimedia_opt
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_multimedia_opt.txt
%endif
################################################################################
%if 0%{?is_opensuse}
%package gnome_office
%pattern_gnomedesktop
Summary: GNOME Office
@ -672,9 +833,11 @@ GNOME Office
%files gnome_office
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_office.txt
%endif
################################################################################
%if 0%{?is_opensuse}
%package gnome_office_opt
%pattern_gnomedesktop
Summary: GNOME Office
@ -695,9 +858,11 @@ GNOME Office
%files gnome_office_opt
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_office_opt.txt
%endif
################################################################################
%if 0%{?is_opensuse}
%package gnome_utilities
%pattern_gnomedesktop
Summary: GNOME Utilities
@ -751,9 +916,11 @@ GNOME Utilities
%files gnome_utilities
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_utilities.txt
%endif
################################################################################
%if 0%{?is_opensuse}
%package gnome_yast
%pattern_basetechnologies
Summary: YaST GNOME User Interfaces
@ -779,9 +946,11 @@ Graphical YaST user interfaces for the GNOME desktop.
%files gnome_yast
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/gnome_yast.txt
%endif
################################################################################
%if 0%{?is_opensuse}
%package sw_management_gnome
%pattern_basetechnologies
Summary: Package Management - Graphical Tools for GNOME
@ -806,19 +975,28 @@ Package Management - Graphical Tools
%files sw_management_gnome
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/sw_management_gnome.txt
%endif
%prep
%build
%install
mkdir -p "%{buildroot}/usr/share/doc/packages/patterns"
for i in devel_gnome gnome gnome_admin gnome_basis gnome_basis_opt \
gnome_games gnome_ide gnome_imaging gnome_imaging_opt gnome_internet \
gnome_laptop gnome_multimedia gnome_multimedia_opt gnome_office \
gnome_office_opt gnome_utilities gnome_yast sw_management_gnome; do
for i in gnome gnome_basis gnome_basic gnome_imaging gnome_laptop gnome_x11; do
echo "This file marks the pattern $i to be installed." \
>"%{buildroot}/usr/share/doc/packages/patterns/$i.txt"
done
%if 0%{?is_opensuse}
for i in devel_gnome gnome_admin gnome_basis_opt \
gnome_games gnome_ide gnome_imaging_opt gnome_internet \
gnome_multimedia gnome_multimedia_opt gnome_office \
gnome_office_opt 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"
done
%endif
%changelog