From 20198ef0f419c9e6f27c100455ef0aa3a93523067abc556ecc7d7b7b19de7852 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 10:50:26 +0000 Subject: [PATCH 1/6] 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 --- patterns-gnome.changes | 78 +++++++++ patterns-gnome.spec | 358 ++++++++++++++++++++++++++++++----------- 2 files changed, 346 insertions(+), 90 deletions(-) diff --git a/patterns-gnome.changes b/patterns-gnome.changes index 8be266f..5bc3540 100644 --- a/patterns-gnome.changes +++ b/patterns-gnome.changes @@ -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 diff --git a/patterns-gnome.spec b/patterns-gnome.spec index ea2a5cd..1c6460f 100644 --- a/patterns-gnome.spec +++ b/patterns-gnome.spec @@ -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 From a99d01d10983f6c786a7e39f2cc27ca203d389ccae0d01b9608e5edf002acb73 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 22 Mar 2018 16:53:35 +0000 Subject: [PATCH 2/6] Accepting request 590300 from home:scarabeus_iv:branches:GNOME:Factory - Drop the gnome-menus as it is dead as snail since 2013 - Reduce remmina/vino/vinagre to require only remmina/vingare as SLE/openSUSE diff, vino is VNC server not needed by default * kill gnome admin which is now empty - Do not recommend amavisd-new - no need for virus scanner - Drop google-droid-fonts, all core pkgs recommend required fonts no need to mess with it in patterns - No longer recommend aria2 - Drop gutenprint and hplip from patterns here, this is handled by printing patterns - Drop gnome-laptop pattern, move gnome-bluetooth recommend to core - Drop gnome-imaging-opt moving dia to gnome-imaging - Remove suggest on sound-juicer - rippers can install it by hand - Remove abiword/gnumeric/pinpoint - we already pull full libreoffice, if someone wants to, they can pull it later on - Switch from empathy to pidgin (also dropping the telepathy connectors) as the empathy is kinda dying while pidgin rocks on - Bump version to $TODAY - Remove libui-gtk-pkg as it is gone - Remove various stray comments - Drop gtk2-devel from devel as we should strive to kill it - Drop gnome-doc-utils-devel as gnome-doc-utils is deprecated - Drop monodevelop as we do not really emphasise mono these days - Drop f-spot as it is gone - Recommend also gstreamer-plugins-libav - Drop yast-scanner and yast-tv as both modules were removed OBS-URL: https://build.opensuse.org/request/show/590300 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/patterns-gnome?expand=0&rev=26 --- patterns-gnome.changes | 40 ++++++++ patterns-gnome.spec | 210 +++-------------------------------------- 2 files changed, 55 insertions(+), 195 deletions(-) diff --git a/patterns-gnome.changes b/patterns-gnome.changes index 5bc3540..aa262fc 100644 --- a/patterns-gnome.changes +++ b/patterns-gnome.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Thu Mar 22 12:39:48 UTC 2018 - tchvatal@suse.com + +- Drop the gnome-menus as it is dead as snail since 2013 + +------------------------------------------------------------------- +Wed Mar 21 10:14:07 UTC 2018 - tchvatal@suse.com + +- Reduce remmina/vino/vinagre to require only remmina/vingare + as SLE/openSUSE diff, vino is VNC server not needed by default + * kill gnome admin which is now empty +- Do not recommend amavisd-new - no need for virus scanner +- Drop google-droid-fonts, all core pkgs recommend required fonts + no need to mess with it in patterns +- No longer recommend aria2 +- Drop gutenprint and hplip from patterns here, this is handled + by printing patterns +- Drop gnome-laptop pattern, move gnome-bluetooth recommend to + core +- Drop gnome-imaging-opt moving dia to gnome-imaging +- Remove suggest on sound-juicer - rippers can install it by hand +- Remove abiword/gnumeric/pinpoint - we already pull full + libreoffice, if someone wants to, they can pull it later on +- Switch from empathy to pidgin (also dropping the telepathy + connectors) as the empathy is kinda dying while pidgin rocks + on + +------------------------------------------------------------------- +Wed Mar 21 09:18:48 UTC 2018 - tchvatal@suse.com + +- Bump version to $TODAY +- Remove libui-gtk-pkg as it is gone +- Remove various stray comments +- Drop gtk2-devel from devel as we should strive to kill it +- Drop gnome-doc-utils-devel as gnome-doc-utils is deprecated +- Drop monodevelop as we do not really emphasise mono these days +- Drop f-spot as it is gone +- Recommend also gstreamer-plugins-libav +- Drop yast-scanner and yast-tv as both modules were removed + ------------------------------------------------------------------- Wed Jan 24 16:00:34 UTC 2018 - fcrozat@suse.com diff --git a/patterns-gnome.spec b/patterns-gnome.spec index 1c6460f..c406a50 100644 --- a/patterns-gnome.spec +++ b/patterns-gnome.spec @@ -19,7 +19,7 @@ %bcond_with betatest Name: patterns-gnome -Version: 20170319 +Version: 20180321 Release: 0 Summary: Patterns for Installation (Gnome) License: MIT @@ -36,8 +36,6 @@ not make sense. This particular package contains all the Gnome patterns. -################################################################################ - %if 0%{?is_opensuse} %package devel_gnome %pattern_development @@ -60,9 +58,7 @@ Recommends: evolution-data-server-devel Recommends: gdk-pixbuf-devel Recommends: glib2-devel Recommends: libgnome-desktop-3-devel -Recommends: gnome-menus-devel Recommends: gnome-online-accounts-devel -Recommends: gtk2-devel Recommends: gtk3-devel Recommends: gtksourceview-devel Recommends: json-glib-devel @@ -82,7 +78,6 @@ Recommends: tracker-devel Recommends: vte-devel # Build tools Recommends: gnome-common -Recommends: gnome-doc-utils-devel Recommends: gobject-introspection-devel Recommends: gtk-doc Recommends: intltool @@ -99,8 +94,6 @@ GNOME development packages. /usr/share/doc/packages/patterns/devel_gnome.txt %endif -################################################################################ - %package gnome_x11 %pattern_graphicalenvironments Summary: GNOME Desktop Environment (X11) @@ -129,7 +122,6 @@ 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() = gnome_utilities @@ -137,9 +129,12 @@ Recommends: pattern() = gnome_utilities # These were not in the tumbleweed pattern Requires: gnome-packagekit +%if 0%{?is_opensuse} +Requires: vinagre +%else Requires: remmina +%endif Requires: xdg-user-dirs-gtk -Recommends: amavisd-new Recommends: dconf-editor # bsc#1069699 Recommends: deja-dup @@ -155,7 +150,6 @@ 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 @@ -174,16 +168,10 @@ 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 @@ -198,7 +186,7 @@ Recommends: planner Recommends: tracker Recommends: tracker-miner-files Recommends: zenity - +Recommends: gnome-bluetooth %if 0%{?is_opensuse} # # Official upstream @@ -230,14 +218,6 @@ Recommends: totem-browser-plugin Recommends: system-config-printer Recommends: tracker-miner-evolution # -# Telepathy connection managers -# -Recommends: telepathy-gabble -Recommends: telepathy-haze -Recommends: telepathy-idle -Recommends: telepathy-rakia -Recommends: telepathy-salut -# # While running a GNOME3 session, it's nice to have the GNOME3 related pinentry # for proper gpg2 integration # @@ -247,12 +227,10 @@ 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 @@ -288,32 +266,6 @@ This pattern installs components for GNOME to run with Wayland and X11 technolog ################################################################################ -%if 0%{?is_opensuse} -%package gnome_admin -%pattern_gnomedesktop -Summary: GNOME Administration Tools -Group: Metapackages -Provides: pattern() = gnome_admin -Provides: pattern-extends() = gnome -Provides: pattern-icon() = pattern-generic -Provides: pattern-order() = 2040 -Requires: pattern() = x11 -Provides: patterns-openSUSE-gnome_admin = %{version} -Obsoletes: patterns-openSUSE-gnome_admin < %{version} -# from data/GNOME-ADMIN -# bnc#372207 -Recommends: vinagre - -%description gnome_admin -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 - -################################################################################ - %package gnome_basis %pattern_graphicalenvironments Summary: GNOME Base System @@ -369,8 +321,6 @@ Recommends: canberra-gtk-play 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 @@ -389,13 +339,10 @@ Recommends: xdg-user-dirs-gtk 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 # @@ -404,7 +351,6 @@ Recommends: gconf2-branding-openSUSE Recommends: gdm-branding-openSUSE Recommends: gio-branding-openSUSE Recommends: gnome-control-center-branding-openSUSE -Recommends: gnome-menus-branding-openSUSE Recommends: gnome-panel-branding-openSUSE Recommends: gtk2-branding-openSUSE Recommends: gtk3-branding-openSUSE @@ -449,7 +395,6 @@ Recommends: gnome-shell-classic # bsc#1063156 Recommends: gnome-calculator Recommends: gnome-software - Recommends: gconf-editor Recommends: gnome-system-monitor # bnc#859494 bsc#1065790 @@ -457,7 +402,6 @@ Recommends: gnome-tweak-tool Recommends: nautilus-extension-terminal Recommends: nautilus-share Recommends: pinentry-gnome3 -Recommends: vino # bsc#1069699 Recommends: file-roller @@ -485,14 +429,9 @@ Obsoletes: patterns-openSUSE-gnome_basis_opt < %{version} # #394406 Recommends: dynamic-wallpaper-branding-openSUSE - -# packages a GTK application -Recommends: gutenprint # MAYBE later lsb-graphics # give net shares Recommends: samba -# needs python-qt4, see#649280#14 -Suggests: hplip %description gnome_basis_opt Base packages for the GNOME desktop environment. @@ -565,7 +504,6 @@ Suggests: giggle Suggests: gnome-devel-docs Suggests: jhbuild Suggests: meld -Suggests: monodevelop Suggests: nemiver %description gnome_ide @@ -588,7 +526,6 @@ Provides: pattern-icon() = package_graphics 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} @@ -604,9 +541,8 @@ Recommends: eog Recommends: gnome-photos Recommends: simple-scan Recommends: inkscape -%if 0%{?is_opensuse} -Suggests: f-spot -%endif +Suggests: dia +Suggests: gthumb %description gnome_imaging Handling of digital photos and graphics @@ -617,33 +553,6 @@ Handling of digital photos and graphics ################################################################################ -%if 0%{?is_opensuse} -%package gnome_imaging_opt -%pattern_gnomedesktop -Summary: GNOME Graphics -Group: Metapackages -Provides: pattern() = gnome_imaging_opt -Provides: pattern-extends() = imaging -Provides: pattern-icon() = package_graphics -Provides: pattern-order() = 2120 -Supplements: packageand(patterns-gnome-gnome:patterns-desktop-imaging) -Requires: pattern() = gnome_basis -Provides: patterns-openSUSE-gnome_imaging_opt = %{version} -Obsoletes: patterns-openSUSE-gnome_imaging_opt < %{version} -# from data/GNOME-IMAGE-OPT -Suggests: dia -Suggests: gthumb - -%description gnome_imaging_opt -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 @@ -659,7 +568,7 @@ Obsoletes: patterns-openSUSE-gnome_internet < %{version} # # Official upstream # -Recommends: empathy +Recommends: pidgin Recommends: evolution # # Packages that really make sense @@ -683,7 +592,6 @@ Suggests: epiphany # Suggests: frogr Suggests: evolution-plugin-rss -Suggests: pidgin %description gnome_internet GNOME Internet Applications @@ -695,33 +603,6 @@ GNOME Internet Applications ################################################################################ -%package gnome_laptop -%pattern_gnomedesktop -Summary: GNOME Laptop -Group: Metapackages -Provides: pattern() = gnome_laptop -Provides: pattern-extends() = laptop -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 - -%description gnome_laptop -GNOME Tools designed specifically for use with laptop computers. - -%files gnome_laptop -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_laptop.txt - -################################################################################ - %if 0%{?is_opensuse} %package gnome_multimedia %pattern_gnomedesktop @@ -732,7 +613,6 @@ Provides: pattern-extends() = multimedia Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2200 Supplements: packageand(patterns-gnome-gnome:patterns-desktop-multimedia) -Recommends: pattern() = gnome_multimedia_opt Provides: patterns-openSUSE-gnome_multimedia = %{version} Obsoletes: patterns-openSUSE-gnome_multimedia < %{version} # @@ -743,6 +623,7 @@ Recommends: gstreamer-plugins-base Recommends: gstreamer-plugins-bad Recommends: gstreamer-plugins-good Recommends: gstreamer-plugins-ugly +Recommends: gstreamer-plugins-libav # bnc#445314 Recommends: gstreamer-utils # @@ -760,7 +641,6 @@ Recommends: gnome-music Suggests: paprefs Suggests: pavucontrol Suggests: pitivi -Suggests: sound-juicer %description gnome_multimedia GNOME Multimedia @@ -772,30 +652,6 @@ GNOME Multimedia ################################################################################ -%if 0%{?is_opensuse} -%package gnome_multimedia_opt -%pattern_gnomedesktop -Summary: GNOME Multimedia -Group: Metapackages -Provides: pattern() = gnome_multimedia_opt -Provides: pattern-extends() = multimedia -Provides: pattern-icon() = pattern-gnome -Provides: pattern-order() = 2180 -Supplements: packageand(patterns-gnome-gnome:patterns-desktop-multimedia) -Provides: patterns-openSUSE-gnome_multimedia_opt = %{version} -Obsoletes: patterns-openSUSE-gnome_multimedia_opt < %{version} -# from data/GNOME-Multimedia-OPT - -%description gnome_multimedia_opt -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 @@ -807,7 +663,6 @@ Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2240 Supplements: packageand(patterns-gnome-gnome:patterns-office-office) Requires: pattern() = gnome_basis -Recommends: pattern() = gnome_office_opt Provides: patterns-openSUSE-gnome_office = %{version} Obsoletes: patterns-openSUSE-gnome_office < %{version} # from data/GNOME-Office @@ -820,11 +675,8 @@ Recommends: evolution # Recommends: libreoffice-gnome Recommends: libreoffice-icon-theme-tango -Suggests: abiword Suggests: evolution-ews Suggests: glabels -Suggests: gnumeric -Suggests: pinpoint Suggests: planner %description gnome_office @@ -837,31 +689,6 @@ GNOME Office ################################################################################ -%if 0%{?is_opensuse} -%package gnome_office_opt -%pattern_gnomedesktop -Summary: GNOME Office -Group: Metapackages -Provides: pattern() = gnome_office_opt -Provides: pattern-extends() = office -Provides: pattern-icon() = pattern-gnome -Provides: pattern-order() = 2220 -Supplements: packageand(patterns-gnome-gnome:patterns-office-office) -Requires: pattern() = gnome_basis -Provides: patterns-openSUSE-gnome_office_opt = %{version} -Obsoletes: patterns-openSUSE-gnome_office_opt < %{version} -Suggests: grisbi - -%description gnome_office_opt -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 @@ -932,13 +759,8 @@ Provides: pattern-order() = 1260 Supplements: packageand(patterns-gnome-gnome:patterns-yast-yast2_basis) Provides: patterns-openSUSE-gnome_yast = %{version} Obsoletes: patterns-openSUSE-gnome_yast < %{version} - -# Use libyui-qt-pkg since libyui-gtk-pkg seems to be unmaintained Requires: libyui-qt-pkg Requires: yast2-control-center-qt -# yast modules for the desktop -Recommends: yast2-scanner -Recommends: yast2-tv %description gnome_yast Graphical YaST user interfaces for the GNOME desktop. @@ -964,10 +786,8 @@ Requires: pattern() = sw_management Requires: pattern() = x11 Provides: patterns-openSUSE-sw_management_gnome = %{version} Obsoletes: patterns-openSUSE-sw_management_gnome < %{version} -# from data/SW-MANGEMENT-GNOME Recommends: gnome-packagekit Recommends: gnome-software -Suggests: libyui-gtk-pkg %description sw_management_gnome Package Management - Graphical Tools @@ -984,16 +804,16 @@ Package Management - Graphical Tools %install mkdir -p "%{buildroot}/usr/share/doc/packages/patterns" -for i in gnome gnome_basis gnome_basic gnome_imaging gnome_laptop gnome_x11; do +for i in gnome gnome_basis gnome_basic gnome_imaging 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 +for i in devel_gnome gnome_basis_opt \ + gnome_games gnome_ide gnome_internet \ + gnome_multimedia 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" done From c13937fb141323b282c3a7087c4f4b28c5e6b2c7cd1249c954da53323b2b9dc9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 24 Mar 2018 13:08:52 +0000 Subject: [PATCH 3/6] Accepting request 590614 from home:scarabeus_iv:branches:GNOME:Factory - Drop dia and inkscape from defaults basically if you want to do vector operations you can install the packages while most users won't use these on default installation OBS-URL: https://build.opensuse.org/request/show/590614 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/patterns-gnome?expand=0&rev=27 --- patterns-gnome.changes | 7 +++++++ patterns-gnome.spec | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/patterns-gnome.changes b/patterns-gnome.changes index aa262fc..6f6110e 100644 --- a/patterns-gnome.changes +++ b/patterns-gnome.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 23 10:14:19 UTC 2018 - tchvatal@suse.com + +- Drop dia and inkscape from defaults basically if you want to do + vector operations you can install the packages while most users + won't use these on default installation + ------------------------------------------------------------------- Thu Mar 22 12:39:48 UTC 2018 - tchvatal@suse.com diff --git a/patterns-gnome.spec b/patterns-gnome.spec index c406a50..b7c2b69 100644 --- a/patterns-gnome.spec +++ b/patterns-gnome.spec @@ -540,8 +540,6 @@ Recommends: eog # Recommends: gnome-photos Recommends: simple-scan -Recommends: inkscape -Suggests: dia Suggests: gthumb %description gnome_imaging From 8480e7cbe98776474fb3b424c273a721eb9d59ac5c38d77b7054db9ee2b43119 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 Apr 2018 12:03:31 +0000 Subject: [PATCH 4/6] - Only recommend gnome-initial-setup on SLE/Leap: those have a crippled variant of g-i-s only doing extended keyboard settings. g-i-s in Tumbleweed is 'the real thing' and is meant for system integrators, that can use it as initial system start to configure the system. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/patterns-gnome?expand=0&rev=28 --- patterns-gnome.changes | 9 + patterns-gnome.spec | 426 ++++++++++++++++++++--------------------- 2 files changed, 217 insertions(+), 218 deletions(-) diff --git a/patterns-gnome.changes b/patterns-gnome.changes index 6f6110e..357e842 100644 --- a/patterns-gnome.changes +++ b/patterns-gnome.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 4 12:01:50 UTC 2018 - dimstar@opensuse.org + +- Only recommend gnome-initial-setup on SLE/Leap: those have a + crippled variant of g-i-s only doing extended keyboard settings. + g-i-s in Tumbleweed is 'the real thing' and is meant for system + integrators, that can use it as initial system start to configure + the system. + ------------------------------------------------------------------- Fri Mar 23 10:14:19 UTC 2018 - tchvatal@suse.com diff --git a/patterns-gnome.spec b/patterns-gnome.spec index b7c2b69..b017940 100644 --- a/patterns-gnome.spec +++ b/patterns-gnome.spec @@ -17,16 +17,14 @@ %bcond_with betatest - Name: patterns-gnome Version: 20180321 Release: 0 Summary: Patterns for Installation (Gnome) License: MIT Group: Metapackages -Url: https://github.com/openSUSE/patterns +URL: https://github.com/openSUSE/patterns Source0: %{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: patterns-rpm-macros %description @@ -45,11 +43,10 @@ Provides: pattern() = devel_gnome Provides: pattern-icon() = pattern-gnome-devel Provides: pattern-order() = 3160 Provides: pattern-visible() -Requires: pattern() = devel_C_C++ -Requires: pattern() = gnome_basis Provides: patterns-openSUSE-devel_gnome = %{version} Obsoletes: patterns-openSUSE-devel_gnome < %{version} - +Requires: pattern() = devel_C_C++ +Requires: pattern() = gnome_basis Recommends: cairo-devel Recommends: clutter-devel Recommends: clutter-gst-devel @@ -57,13 +54,19 @@ Recommends: clutter-gtk-devel Recommends: evolution-data-server-devel Recommends: gdk-pixbuf-devel Recommends: glib2-devel -Recommends: libgnome-desktop-3-devel +# Build tools +Recommends: gnome-common Recommends: gnome-online-accounts-devel +Recommends: gobject-introspection-devel +Recommends: gtk-doc Recommends: gtk3-devel Recommends: gtksourceview-devel +Recommends: intltool +Recommends: itstool Recommends: json-glib-devel Recommends: libcanberra-devel Recommends: libgdata-devel +Recommends: libgnome-desktop-3-devel Recommends: libgnome-keyring-devel Recommends: libgsf-devel Recommends: libgtop-devel @@ -75,14 +78,8 @@ Recommends: libwebkitgtk-devel Recommends: libwnck-devel Recommends: pango-devel Recommends: tracker-devel -Recommends: vte-devel -# Build tools -Recommends: gnome-common -Recommends: gobject-introspection-devel -Recommends: gtk-doc -Recommends: intltool -Recommends: itstool Recommends: vala +Recommends: vte-devel Recommends: yelp-tools Suggests: python-gobject-devel @@ -90,8 +87,8 @@ Suggests: python-gobject-devel GNOME development packages. %files devel_gnome -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/devel_gnome.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/devel_gnome.txt %endif %package gnome_x11 @@ -103,6 +100,76 @@ Provides: pattern-icon() = pattern-gnome_x11 Provides: pattern-order() = 1010 Provides: pattern-visible() %if 0%{?is_opensuse} +Requires: pattern() = gnome_basis +%else +# bsc#1065166 +Requires: pattern() = gnome_basic +%endif +%if 0%{?is_opensuse} +Recommends: pattern() = games +Recommends: pattern() = gnome_internet +Recommends: pattern() = gnome_utilities +Recommends: pattern() = imaging +Recommends: pattern() = multimedia +%endif +# These were not in the tumbleweed pattern +Requires: gnome-packagekit +# #447627 +Requires: gnome-user-share +# #545263 +Requires: seahorse +Requires: totem +Requires: xdg-user-dirs-gtk +Recommends: pattern() = gnome_imaging +Recommends: pattern() = office +Recommends: pattern() = x11_yast +# bnc#366894 +Recommends: caribou +# +# Official upstream +# +# no longer need to hard require cheese for g-c-c user panel +Recommends: cheese +Recommends: dconf-editor +# bsc#1069699 +Recommends: deja-dup +Recommends: evince +Recommends: evolution +Recommends: evolution-ews +Recommends: gimp +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-documents +Recommends: gnome-icon-theme +Recommends: gnote +Recommends: gpgme +# #399801 +Recommends: mousetweaks +Recommends: nautilus-eiciel +Recommends: nautilus-sendto +Recommends: noto-sans-cjk-fonts +Recommends: orca +# bsc#1065191 +Recommends: pidgin +Recommends: planner +Recommends: python3-speechd +Recommends: speech-dispatcher +Recommends: speech-dispatcher-module-espeak +# #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 @@ -110,83 +177,13 @@ 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_internet -Recommends: pattern() = multimedia -Recommends: pattern() = gnome_utilities -%endif - -# These were not in the tumbleweed pattern -Requires: gnome-packagekit -%if 0%{?is_opensuse} Requires: vinagre %else Requires: remmina %endif -Requires: xdg-user-dirs-gtk -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 +%if %{?sle_version} Recommends: gnome-initial-setup -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 -# bnc#366894 -Recommends: caribou -# bsc#1065191 -Recommends: pidgin -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 -Recommends: gnome-bluetooth +%endif %if 0%{?is_opensuse} # # Official upstream @@ -194,8 +191,6 @@ Recommends: gnome-bluetooth # #544192 Recommends: baobab Recommends: bijiben -# #302492 -Suggests: brasero Recommends: file-roller Recommends: gcr-viewer Recommends: gedit @@ -203,25 +198,25 @@ Recommends: gnome-characters Recommends: gnome-contacts Recommends: gnome-dictionary Recommends: gnome-documents - Recommends: gnome-logs Recommends: gnome-maps Recommends: gnome-screenshot Recommends: gnome-system-monitor - -Recommends: sushi -Recommends: totem-browser-plugin -# -# Packages that really make sense -# -# Tool for advanced configuration of printers -Recommends: system-config-printer -Recommends: tracker-miner-evolution # # 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 +# #302492 +Suggests: brasero Suggests: dasher Suggests: gconf-editor Suggests: gnome-backgrounds @@ -230,11 +225,11 @@ Suggests: gnome-color-manager %else # This is NetworkManager-applet in tumbleweed Recommends: NetworkManager-gnome -Recommends: desktop-data-SLE-extra +Recommends: NetworkManager-openconnect-gnome # bsc#1065148 Recommends: NetworkManager-openvpn-gnome Recommends: NetworkManager-pptp-gnome -Recommends: NetworkManager-openconnect-gnome +Recommends: desktop-data-SLE-extra %endif %description gnome_x11 @@ -242,8 +237,8 @@ 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 +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_x11.txt ################################################################################ @@ -252,8 +247,8 @@ This pattern installs components for GNOME to run with X11 technology. Summary: GNOME Desktop Environment (Wayland) Group: Metapackages Provides: pattern() = gnome -Requires: pattern() = gnome_x11 Provides: pattern-order() = 2040 +Requires: pattern() = gnome_x11 Recommends: gnome-session-wayland %description gnome @@ -261,8 +256,8 @@ 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 -/usr/share/doc/packages/patterns/gnome.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome.txt ################################################################################ @@ -273,21 +268,30 @@ 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 Provides: patterns-openSUSE-gnome_basis = %{version} Obsoletes: patterns-openSUSE-gnome_basis < %{version} +Recommends: pattern() = gnome_basis_opt %endif - +Requires: pattern() = x11 Requires: gdm Requires: gnome-session +# 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 +Recommends: gnome-power-manager # 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 @@ -297,6 +301,20 @@ Requires: gnome-session # somehow a bit usable # Recommends: gnome-session-default-session +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 +Recommends: pulseaudio-module-gconf +Recommends: pulseaudio-module-x11 +Recommends: samba +# #509829 +Recommends: xdg-user-dirs-gtk +Recommends: yelp # # Low-level parts that we need # @@ -305,41 +323,15 @@ Recommends: gnome-session-default-session Recommends: NetworkManager Recommends: NetworkManager-applet %endif -Recommends: desktop-file-utils -Recommends: gpgme -Recommends: polkit-default-privs -Recommends: samba -# -# 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 -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: desktop-data %if 0%{is_opensuse} Recommends: MozillaFirefox Recommends: avahi @@ -362,8 +354,8 @@ Recommends: libsocialweb-branding-openSUSE Base packages for the GNOME desktop environment. %files gnome_basis -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_basis.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_basis.txt ################################################################################ %package gnome_basic @@ -371,39 +363,38 @@ Base packages for the GNOME desktop environment. 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 +# TEST +Requires: pattern() = gnome_basis Requires: pattern() = x11_enhanced - Requires: gsettings-backend-dconf # bsc#1065945 Recommends: brasero Recommends: evince +# bsc#1069699 +Recommends: file-roller +Recommends: gconf-editor # bsc#1065146 Recommends: gedit -Recommends: gnome-shell-classic # implified by gnome-keyring-pam # Recommends: gnome-keyring # bsc#1063156 Recommends: gnome-calculator +Recommends: gnome-shell-classic 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 -# bsc#1069699 -Recommends: file-roller +%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. @@ -423,10 +414,9 @@ Provides: pattern() = gnome_basis_opt Provides: pattern-extends() = gnome_basis Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 1420 -Requires: pattern() = x11 Provides: patterns-openSUSE-gnome_basis_opt = %{version} Obsoletes: patterns-openSUSE-gnome_basis_opt < %{version} - +Requires: pattern() = x11 # #394406 Recommends: dynamic-wallpaper-branding-openSUSE # MAYBE later lsb-graphics @@ -437,8 +427,8 @@ Recommends: samba 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 +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_basis_opt.txt %endif ################################################################################ @@ -448,32 +438,32 @@ Base packages for the GNOME desktop environment. %pattern_gnomedesktop Summary: GNOME Games Group: Metapackages -Provides: patterns-openSUSE-gnome_games = %{version} Provides: pattern() = gnome_games Provides: pattern-extends() = games Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2100 +Provides: patterns-openSUSE-gnome_games = %{version} Obsoletes: patterns-openSUSE-gnome_games < %{version} -Supplements: packageand(patterns-gnome-gnome:patterns-games-games) -# from data/GNOME-Games -Recommends: iagno -Recommends: lightsoff -Recommends: quadrapassel Recommends: gnome-chess Recommends: gnome-mahjongg Recommends: gnome-mines Recommends: gnome-sudoku -Recommends: swell-foop Recommends: gnuchess +# from data/GNOME-Games +Recommends: iagno +Recommends: lightsoff +Recommends: quadrapassel +Recommends: swell-foop Suggests: gnome-games-extra-data Suggests: phalanx +Supplements: packageand(patterns-gnome-gnome:patterns-games-games) %description gnome_games GNOME Games %files gnome_games -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_games.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_games.txt %endif ################################################################################ @@ -483,10 +473,10 @@ GNOME Games %pattern_gnomedesktop Summary: GNOME Integrated Development Environment Group: Metapackages -Provides: patterns-openSUSE-gnome_ide = %{version} Provides: pattern() = gnome_ide Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 2060 +Provides: patterns-openSUSE-gnome_ide = %{version} Obsoletes: patterns-openSUSE-gnome_ide < %{version} # from data/GNOME-IDE Recommends: devhelp @@ -510,8 +500,8 @@ Suggests: nemiver Development under GNOME %files gnome_ide -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_ide.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_ide.txt %endif ################################################################################ @@ -524,12 +514,7 @@ Provides: pattern() = gnome_imaging Provides: pattern-extends() = imaging Provides: pattern-icon() = package_graphics Provides: pattern-order() = 2140 -Supplements: packageand(patterns-gnome-gnome:patterns-desktop-imaging) Requires: pattern() = gnome_basis -%if 0%{?is_opensuse} -Provides: patterns-openSUSE-gnome_imaging = %{version} -Obsoletes: patterns-openSUSE-gnome_imaging < %{version} -%endif # from data/GNOME-IMAGE # # Official upstream @@ -541,13 +526,18 @@ Recommends: eog Recommends: gnome-photos Recommends: simple-scan Suggests: gthumb +Supplements: packageand(patterns-gnome-gnome:patterns-desktop-imaging) +%if 0%{?is_opensuse} +Provides: patterns-openSUSE-gnome_imaging = %{version} +Obsoletes: patterns-openSUSE-gnome_imaging < %{version} +%endif %description gnome_imaging Handling of digital photos and graphics %files gnome_imaging -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_imaging.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_imaging.txt ################################################################################ @@ -556,18 +546,13 @@ Handling of digital photos and graphics %pattern_gnomedesktop Summary: GNOME Internet Group: Metapackages -Provides: patterns-openSUSE-gnome_internet = %{version} Provides: pattern() = gnome_internet Provides: pattern-extends() = gnome Provides: pattern-icon() = package_network Provides: pattern-order() = 2420 +Provides: patterns-openSUSE-gnome_internet = %{version} Obsoletes: patterns-openSUSE-gnome_internet < %{version} -# from data/GNOME-Internet -# -# Official upstream -# -Recommends: pidgin -Recommends: evolution +Recommends: NetworkManager-openconnect-gnome # # Packages that really make sense # @@ -575,28 +560,33 @@ Recommends: evolution Recommends: NetworkManager-openvpn-gnome Recommends: NetworkManager-pptp-gnome Recommends: NetworkManager-vpnc-gnome -Recommends: NetworkManager-openconnect-gnome +Recommends: evolution +# from data/GNOME-Internet +# +# Official upstream +# +Recommends: pidgin +Recommends: polari # bnc#530416 Recommends: transmission-gtk -Recommends: polari # # Official upstream # # bnc#366894 Suggests: ekiga Suggests: epiphany +Suggests: evolution-plugin-rss # # Packages that can make sense # Suggests: frogr -Suggests: evolution-plugin-rss %description gnome_internet GNOME Internet Applications %files gnome_internet -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_internet.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_internet.txt %endif ################################################################################ @@ -610,18 +600,21 @@ Provides: pattern() = gnome_multimedia Provides: pattern-extends() = multimedia Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2200 -Supplements: packageand(patterns-gnome-gnome:patterns-desktop-multimedia) Provides: patterns-openSUSE-gnome_multimedia = %{version} Obsoletes: patterns-openSUSE-gnome_multimedia < %{version} # +# Packages that really make sense +# +Recommends: gnome-music +Recommends: gstreamer-plugins-bad +# # GStreamer magic # # software.openSUSE.org/codecs Recommends: gstreamer-plugins-base -Recommends: gstreamer-plugins-bad Recommends: gstreamer-plugins-good -Recommends: gstreamer-plugins-ugly Recommends: gstreamer-plugins-libav +Recommends: gstreamer-plugins-ugly # bnc#445314 Recommends: gstreamer-utils # @@ -632,20 +625,17 @@ Recommends: totem-browser-plugin # # Packages that really make sense # -Recommends: gnome-music -# -# Packages that really make sense -# Suggests: paprefs Suggests: pavucontrol Suggests: pitivi +Supplements: packageand(patterns-gnome-gnome:patterns-desktop-multimedia) %description gnome_multimedia GNOME Multimedia %files gnome_multimedia -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_multimedia.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_multimedia.txt %endif ################################################################################ @@ -659,10 +649,9 @@ Provides: pattern() = gnome_office Provides: pattern-extends() = office Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2240 -Supplements: packageand(patterns-gnome-gnome:patterns-office-office) -Requires: pattern() = gnome_basis Provides: patterns-openSUSE-gnome_office = %{version} Obsoletes: patterns-openSUSE-gnome_office < %{version} +Requires: pattern() = gnome_basis # from data/GNOME-Office # # Official upstream @@ -676,13 +665,14 @@ Recommends: libreoffice-icon-theme-tango Suggests: evolution-ews Suggests: glabels Suggests: planner +Supplements: packageand(patterns-gnome-gnome:patterns-office-office) %description gnome_office GNOME Office %files gnome_office -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_office.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_office.txt %endif ################################################################################ @@ -696,32 +686,32 @@ Provides: pattern() = gnome_utilities Provides: pattern-extends() = gnome Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2280 -Requires: pattern() = gnome_basis Provides: patterns-openSUSE-gnome_utilities = %{version} Obsoletes: patterns-openSUSE-gnome_utilities < %{version} +Requires: pattern() = gnome_basis # # Official upstream # Recommends: baobab +Recommends: bijiben Recommends: cheese Recommends: file-roller +Recommends: gdk-pixbuf-thumbnailer Recommends: gedit Recommends: gnome-calculator Recommends: gnome-characters Recommends: gnome-dictionary Recommends: gnome-screenshot -Recommends: nautilus-extension-seahorse -Recommends: nautilus-sendto -Recommends: seahorse -Recommends: bijiben # # Packages that really make sense # Recommends: gnome-tweak-tool -Recommends: gsf-office-thumbnailer -Recommends: gdk-pixbuf-thumbnailer -Recommends: rsvg-thumbnailer Recommends: gnome-weather +Recommends: gsf-office-thumbnailer +Recommends: nautilus-extension-seahorse +Recommends: nautilus-sendto +Recommends: rsvg-thumbnailer +Recommends: seahorse # # Official upstream # @@ -739,8 +729,8 @@ Suggests: nautilus-share GNOME Utilities %files gnome_utilities -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/gnome_utilities.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_utilities.txt %endif ################################################################################ @@ -754,18 +744,18 @@ Provides: pattern() = gnome_yast Provides: pattern-extends() = yast2_basis Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 1260 -Supplements: packageand(patterns-gnome-gnome:patterns-yast-yast2_basis) Provides: patterns-openSUSE-gnome_yast = %{version} Obsoletes: patterns-openSUSE-gnome_yast < %{version} Requires: libyui-qt-pkg Requires: yast2-control-center-qt +Supplements: packageand(patterns-gnome-gnome:patterns-yast-yast2_basis) %description gnome_yast 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 +%dir %{_docdir}/patterns +%{_docdir}/patterns/gnome_yast.txt %endif ################################################################################ @@ -779,20 +769,20 @@ Provides: pattern() = sw_management_gnome Provides: pattern-extends() = sw_management Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 1780 -Supplements: packageand(patterns-gnome-gnome_basis:patterns-base-sw_management) -Requires: pattern() = sw_management -Requires: pattern() = x11 Provides: patterns-openSUSE-sw_management_gnome = %{version} Obsoletes: patterns-openSUSE-sw_management_gnome < %{version} +Requires: pattern() = sw_management +Requires: pattern() = x11 Recommends: gnome-packagekit Recommends: gnome-software +Supplements: packageand(patterns-gnome-gnome_basis:patterns-base-sw_management) %description sw_management_gnome Package Management - Graphical Tools %files sw_management_gnome -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/sw_management_gnome.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/sw_management_gnome.txt %endif %prep @@ -801,10 +791,10 @@ Package Management - Graphical Tools %install -mkdir -p "%{buildroot}/usr/share/doc/packages/patterns" +mkdir -p "%{buildroot}%{_docdir}/patterns" for i in gnome gnome_basis gnome_basic gnome_imaging gnome_x11; do echo "This file marks the pattern $i to be installed." \ - >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt" + >"%{buildroot}%{_docdir}/patterns/$i.txt" done %if 0%{?is_opensuse} @@ -813,7 +803,7 @@ for i in devel_gnome gnome_basis_opt \ gnome_multimedia 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" + >"%{buildroot}%{_docdir}/patterns/$i.txt" done %endif From a2d5cbc0978986cc0e95fe320c78639cbe58132b1a69897b1480680ff551a6b7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 Apr 2018 13:24:05 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/patterns-gnome?expand=0&rev=29 --- patterns-gnome.spec | 420 +++++++++++++++++++++++--------------------- 1 file changed, 216 insertions(+), 204 deletions(-) diff --git a/patterns-gnome.spec b/patterns-gnome.spec index b017940..0c99621 100644 --- a/patterns-gnome.spec +++ b/patterns-gnome.spec @@ -17,14 +17,16 @@ %bcond_with betatest + Name: patterns-gnome Version: 20180321 Release: 0 Summary: Patterns for Installation (Gnome) License: MIT Group: Metapackages -URL: https://github.com/openSUSE/patterns +Url: https://github.com/openSUSE/patterns Source0: %{name}-rpmlintrc +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: patterns-rpm-macros %description @@ -43,10 +45,11 @@ Provides: pattern() = devel_gnome Provides: pattern-icon() = pattern-gnome-devel Provides: pattern-order() = 3160 Provides: pattern-visible() -Provides: patterns-openSUSE-devel_gnome = %{version} -Obsoletes: patterns-openSUSE-devel_gnome < %{version} Requires: pattern() = devel_C_C++ Requires: pattern() = gnome_basis +Provides: patterns-openSUSE-devel_gnome = %{version} +Obsoletes: patterns-openSUSE-devel_gnome < %{version} + Recommends: cairo-devel Recommends: clutter-devel Recommends: clutter-gst-devel @@ -54,19 +57,13 @@ Recommends: clutter-gtk-devel Recommends: evolution-data-server-devel Recommends: gdk-pixbuf-devel Recommends: glib2-devel -# Build tools -Recommends: gnome-common +Recommends: libgnome-desktop-3-devel Recommends: gnome-online-accounts-devel -Recommends: gobject-introspection-devel -Recommends: gtk-doc Recommends: gtk3-devel Recommends: gtksourceview-devel -Recommends: intltool -Recommends: itstool Recommends: json-glib-devel Recommends: libcanberra-devel Recommends: libgdata-devel -Recommends: libgnome-desktop-3-devel Recommends: libgnome-keyring-devel Recommends: libgsf-devel Recommends: libgtop-devel @@ -78,8 +75,14 @@ Recommends: libwebkitgtk-devel Recommends: libwnck-devel Recommends: pango-devel Recommends: tracker-devel -Recommends: vala Recommends: vte-devel +# Build tools +Recommends: gnome-common +Recommends: gobject-introspection-devel +Recommends: gtk-doc +Recommends: intltool +Recommends: itstool +Recommends: vala Recommends: yelp-tools Suggests: python-gobject-devel @@ -87,8 +90,8 @@ Suggests: python-gobject-devel GNOME development packages. %files devel_gnome -%dir %{_docdir}/patterns -%{_docdir}/patterns/devel_gnome.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/devel_gnome.txt %endif %package gnome_x11 @@ -100,76 +103,6 @@ Provides: pattern-icon() = pattern-gnome_x11 Provides: pattern-order() = 1010 Provides: pattern-visible() %if 0%{?is_opensuse} -Requires: pattern() = gnome_basis -%else -# bsc#1065166 -Requires: pattern() = gnome_basic -%endif -%if 0%{?is_opensuse} -Recommends: pattern() = games -Recommends: pattern() = gnome_internet -Recommends: pattern() = gnome_utilities -Recommends: pattern() = imaging -Recommends: pattern() = multimedia -%endif -# These were not in the tumbleweed pattern -Requires: gnome-packagekit -# #447627 -Requires: gnome-user-share -# #545263 -Requires: seahorse -Requires: totem -Requires: xdg-user-dirs-gtk -Recommends: pattern() = gnome_imaging -Recommends: pattern() = office -Recommends: pattern() = x11_yast -# bnc#366894 -Recommends: caribou -# -# Official upstream -# -# no longer need to hard require cheese for g-c-c user panel -Recommends: cheese -Recommends: dconf-editor -# bsc#1069699 -Recommends: deja-dup -Recommends: evince -Recommends: evolution -Recommends: evolution-ews -Recommends: gimp -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-documents -Recommends: gnome-icon-theme -Recommends: gnote -Recommends: gpgme -# #399801 -Recommends: mousetweaks -Recommends: nautilus-eiciel -Recommends: nautilus-sendto -Recommends: noto-sans-cjk-fonts -Recommends: orca -# bsc#1065191 -Recommends: pidgin -Recommends: planner -Recommends: python3-speechd -Recommends: speech-dispatcher -Recommends: speech-dispatcher-module-espeak -# #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 @@ -177,13 +110,85 @@ 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_internet +Recommends: pattern() = multimedia +Recommends: pattern() = gnome_utilities +%endif + +# These were not in the tumbleweed pattern +Requires: gnome-packagekit +%if 0%{?is_opensuse} Requires: vinagre %else Requires: remmina %endif -%if %{?sle_version} +Requires: xdg-user-dirs-gtk +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 +%if 0%{?sle_version} Recommends: gnome-initial-setup %endif +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 +# bnc#366894 +Recommends: caribou +# bsc#1065191 +Recommends: pidgin +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 +Recommends: gnome-bluetooth %if 0%{?is_opensuse} # # Official upstream @@ -191,6 +196,8 @@ Recommends: gnome-initial-setup # #544192 Recommends: baobab Recommends: bijiben +# #302492 +Suggests: brasero Recommends: file-roller Recommends: gcr-viewer Recommends: gedit @@ -198,25 +205,25 @@ Recommends: gnome-characters Recommends: gnome-contacts Recommends: gnome-dictionary Recommends: gnome-documents + Recommends: gnome-logs Recommends: gnome-maps Recommends: gnome-screenshot Recommends: gnome-system-monitor -# -# While running a GNOME3 session, it's nice to have the GNOME3 related pinentry -# for proper gpg2 integration -# -Recommends: pinentry-gnome3 + Recommends: sushi +Recommends: totem-browser-plugin # # Packages that really make sense # # Tool for advanced configuration of printers Recommends: system-config-printer -Recommends: totem-browser-plugin Recommends: tracker-miner-evolution -# #302492 -Suggests: brasero +# +# While running a GNOME3 session, it's nice to have the GNOME3 related pinentry +# for proper gpg2 integration +# +Recommends: pinentry-gnome3 Suggests: dasher Suggests: gconf-editor Suggests: gnome-backgrounds @@ -225,11 +232,11 @@ Suggests: gnome-color-manager %else # This is NetworkManager-applet in tumbleweed Recommends: NetworkManager-gnome -Recommends: NetworkManager-openconnect-gnome +Recommends: desktop-data-SLE-extra # bsc#1065148 Recommends: NetworkManager-openvpn-gnome Recommends: NetworkManager-pptp-gnome -Recommends: desktop-data-SLE-extra +Recommends: NetworkManager-openconnect-gnome %endif %description gnome_x11 @@ -237,8 +244,8 @@ 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 %{_docdir}/patterns -%{_docdir}/patterns/gnome_x11.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_x11.txt ################################################################################ @@ -247,8 +254,8 @@ This pattern installs components for GNOME to run with X11 technology. Summary: GNOME Desktop Environment (Wayland) Group: Metapackages Provides: pattern() = gnome -Provides: pattern-order() = 2040 Requires: pattern() = gnome_x11 +Provides: pattern-order() = 2040 Recommends: gnome-session-wayland %description gnome @@ -256,8 +263,8 @@ 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 +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome.txt ################################################################################ @@ -268,30 +275,21 @@ 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 Provides: patterns-openSUSE-gnome_basis = %{version} Obsoletes: patterns-openSUSE-gnome_basis < %{version} -Recommends: pattern() = gnome_basis_opt %endif -Requires: pattern() = x11 + Requires: gdm Requires: gnome-session -# 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 -Recommends: gnome-power-manager # 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 @@ -301,20 +299,6 @@ Recommends: gnome-power-manager # somehow a bit usable # Recommends: gnome-session-default-session -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 -Recommends: pulseaudio-module-gconf -Recommends: pulseaudio-module-x11 -Recommends: samba -# #509829 -Recommends: xdg-user-dirs-gtk -Recommends: yelp # # Low-level parts that we need # @@ -323,15 +307,41 @@ Recommends: yelp Recommends: NetworkManager Recommends: NetworkManager-applet %endif +Recommends: desktop-file-utils +Recommends: gpgme +Recommends: polkit-default-privs +Recommends: samba +# +# 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 +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: desktop-data %if 0%{is_opensuse} Recommends: MozillaFirefox Recommends: avahi @@ -354,8 +364,8 @@ Recommends: libsocialweb-branding-openSUSE Base packages for the GNOME desktop environment. %files gnome_basis -%dir %{_docdir}/patterns -%{_docdir}/patterns/gnome_basis.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_basis.txt ################################################################################ %package gnome_basic @@ -363,38 +373,39 @@ Base packages for the GNOME desktop environment. 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() -# ENDTEST -Requires: pattern() = basesystem # TEST Requires: pattern() = gnome_basis +# ENDTEST +Requires: pattern() = basesystem Requires: pattern() = x11_enhanced + Requires: gsettings-backend-dconf # bsc#1065945 Recommends: brasero Recommends: evince -# bsc#1069699 -Recommends: file-roller -Recommends: gconf-editor # bsc#1065146 Recommends: gedit +Recommends: gnome-shell-classic # implified by gnome-keyring-pam # Recommends: gnome-keyring # bsc#1063156 Recommends: gnome-calculator -Recommends: gnome-shell-classic 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 -%if !0%{?is_opensuse} -Obsoletes: patterns-sles-gnome-basic -%endif +# bsc#1069699 +Recommends: file-roller %description gnome_basic The GNOME desktop environment is an intuitive and attractive desktop for users. @@ -414,9 +425,10 @@ Provides: pattern() = gnome_basis_opt Provides: pattern-extends() = gnome_basis Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 1420 +Requires: pattern() = x11 Provides: patterns-openSUSE-gnome_basis_opt = %{version} Obsoletes: patterns-openSUSE-gnome_basis_opt < %{version} -Requires: pattern() = x11 + # #394406 Recommends: dynamic-wallpaper-branding-openSUSE # MAYBE later lsb-graphics @@ -427,8 +439,8 @@ Recommends: samba Base packages for the GNOME desktop environment. %files gnome_basis_opt -%dir %{_docdir}/patterns -%{_docdir}/patterns/gnome_basis_opt.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_basis_opt.txt %endif ################################################################################ @@ -438,32 +450,32 @@ Base packages for the GNOME desktop environment. %pattern_gnomedesktop Summary: GNOME Games Group: Metapackages +Provides: patterns-openSUSE-gnome_games = %{version} Provides: pattern() = gnome_games Provides: pattern-extends() = games Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2100 -Provides: patterns-openSUSE-gnome_games = %{version} Obsoletes: patterns-openSUSE-gnome_games < %{version} -Recommends: gnome-chess -Recommends: gnome-mahjongg -Recommends: gnome-mines -Recommends: gnome-sudoku -Recommends: gnuchess +Supplements: packageand(patterns-gnome-gnome:patterns-games-games) # from data/GNOME-Games Recommends: iagno Recommends: lightsoff Recommends: quadrapassel +Recommends: gnome-chess +Recommends: gnome-mahjongg +Recommends: gnome-mines +Recommends: gnome-sudoku Recommends: swell-foop +Recommends: gnuchess Suggests: gnome-games-extra-data Suggests: phalanx -Supplements: packageand(patterns-gnome-gnome:patterns-games-games) %description gnome_games GNOME Games %files gnome_games -%dir %{_docdir}/patterns -%{_docdir}/patterns/gnome_games.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_games.txt %endif ################################################################################ @@ -473,10 +485,10 @@ GNOME Games %pattern_gnomedesktop Summary: GNOME Integrated Development Environment Group: Metapackages +Provides: patterns-openSUSE-gnome_ide = %{version} Provides: pattern() = gnome_ide Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 2060 -Provides: patterns-openSUSE-gnome_ide = %{version} Obsoletes: patterns-openSUSE-gnome_ide < %{version} # from data/GNOME-IDE Recommends: devhelp @@ -500,8 +512,8 @@ Suggests: nemiver Development under GNOME %files gnome_ide -%dir %{_docdir}/patterns -%{_docdir}/patterns/gnome_ide.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_ide.txt %endif ################################################################################ @@ -514,7 +526,12 @@ Provides: pattern() = gnome_imaging Provides: pattern-extends() = imaging Provides: pattern-icon() = package_graphics Provides: pattern-order() = 2140 +Supplements: packageand(patterns-gnome-gnome:patterns-desktop-imaging) Requires: pattern() = gnome_basis +%if 0%{?is_opensuse} +Provides: patterns-openSUSE-gnome_imaging = %{version} +Obsoletes: patterns-openSUSE-gnome_imaging < %{version} +%endif # from data/GNOME-IMAGE # # Official upstream @@ -526,18 +543,13 @@ Recommends: eog Recommends: gnome-photos Recommends: simple-scan Suggests: gthumb -Supplements: packageand(patterns-gnome-gnome:patterns-desktop-imaging) -%if 0%{?is_opensuse} -Provides: patterns-openSUSE-gnome_imaging = %{version} -Obsoletes: patterns-openSUSE-gnome_imaging < %{version} -%endif %description gnome_imaging Handling of digital photos and graphics %files gnome_imaging -%dir %{_docdir}/patterns -%{_docdir}/patterns/gnome_imaging.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_imaging.txt ################################################################################ @@ -546,13 +558,18 @@ Handling of digital photos and graphics %pattern_gnomedesktop Summary: GNOME Internet Group: Metapackages +Provides: patterns-openSUSE-gnome_internet = %{version} Provides: pattern() = gnome_internet Provides: pattern-extends() = gnome Provides: pattern-icon() = package_network Provides: pattern-order() = 2420 -Provides: patterns-openSUSE-gnome_internet = %{version} Obsoletes: patterns-openSUSE-gnome_internet < %{version} -Recommends: NetworkManager-openconnect-gnome +# from data/GNOME-Internet +# +# Official upstream +# +Recommends: pidgin +Recommends: evolution # # Packages that really make sense # @@ -560,33 +577,28 @@ Recommends: NetworkManager-openconnect-gnome Recommends: NetworkManager-openvpn-gnome Recommends: NetworkManager-pptp-gnome Recommends: NetworkManager-vpnc-gnome -Recommends: evolution -# from data/GNOME-Internet -# -# Official upstream -# -Recommends: pidgin -Recommends: polari +Recommends: NetworkManager-openconnect-gnome # bnc#530416 Recommends: transmission-gtk +Recommends: polari # # Official upstream # # bnc#366894 Suggests: ekiga Suggests: epiphany -Suggests: evolution-plugin-rss # # Packages that can make sense # Suggests: frogr +Suggests: evolution-plugin-rss %description gnome_internet GNOME Internet Applications %files gnome_internet -%dir %{_docdir}/patterns -%{_docdir}/patterns/gnome_internet.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_internet.txt %endif ################################################################################ @@ -600,21 +612,18 @@ Provides: pattern() = gnome_multimedia Provides: pattern-extends() = multimedia Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2200 +Supplements: packageand(patterns-gnome-gnome:patterns-desktop-multimedia) Provides: patterns-openSUSE-gnome_multimedia = %{version} Obsoletes: patterns-openSUSE-gnome_multimedia < %{version} # -# Packages that really make sense -# -Recommends: gnome-music -Recommends: gstreamer-plugins-bad -# # GStreamer magic # # software.openSUSE.org/codecs Recommends: gstreamer-plugins-base +Recommends: gstreamer-plugins-bad Recommends: gstreamer-plugins-good -Recommends: gstreamer-plugins-libav Recommends: gstreamer-plugins-ugly +Recommends: gstreamer-plugins-libav # bnc#445314 Recommends: gstreamer-utils # @@ -625,17 +634,20 @@ Recommends: totem-browser-plugin # # Packages that really make sense # +Recommends: gnome-music +# +# Packages that really make sense +# Suggests: paprefs Suggests: pavucontrol Suggests: pitivi -Supplements: packageand(patterns-gnome-gnome:patterns-desktop-multimedia) %description gnome_multimedia GNOME Multimedia %files gnome_multimedia -%dir %{_docdir}/patterns -%{_docdir}/patterns/gnome_multimedia.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_multimedia.txt %endif ################################################################################ @@ -649,9 +661,10 @@ Provides: pattern() = gnome_office Provides: pattern-extends() = office Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2240 +Supplements: packageand(patterns-gnome-gnome:patterns-office-office) +Requires: pattern() = gnome_basis Provides: patterns-openSUSE-gnome_office = %{version} Obsoletes: patterns-openSUSE-gnome_office < %{version} -Requires: pattern() = gnome_basis # from data/GNOME-Office # # Official upstream @@ -665,14 +678,13 @@ Recommends: libreoffice-icon-theme-tango Suggests: evolution-ews Suggests: glabels Suggests: planner -Supplements: packageand(patterns-gnome-gnome:patterns-office-office) %description gnome_office GNOME Office %files gnome_office -%dir %{_docdir}/patterns -%{_docdir}/patterns/gnome_office.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_office.txt %endif ################################################################################ @@ -686,32 +698,32 @@ Provides: pattern() = gnome_utilities Provides: pattern-extends() = gnome Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 2280 +Requires: pattern() = gnome_basis Provides: patterns-openSUSE-gnome_utilities = %{version} Obsoletes: patterns-openSUSE-gnome_utilities < %{version} -Requires: pattern() = gnome_basis # # Official upstream # Recommends: baobab -Recommends: bijiben Recommends: cheese Recommends: file-roller -Recommends: gdk-pixbuf-thumbnailer Recommends: gedit Recommends: gnome-calculator Recommends: gnome-characters Recommends: gnome-dictionary Recommends: gnome-screenshot +Recommends: nautilus-extension-seahorse +Recommends: nautilus-sendto +Recommends: seahorse +Recommends: bijiben # # Packages that really make sense # Recommends: gnome-tweak-tool -Recommends: gnome-weather Recommends: gsf-office-thumbnailer -Recommends: nautilus-extension-seahorse -Recommends: nautilus-sendto +Recommends: gdk-pixbuf-thumbnailer Recommends: rsvg-thumbnailer -Recommends: seahorse +Recommends: gnome-weather # # Official upstream # @@ -729,8 +741,8 @@ Suggests: nautilus-share GNOME Utilities %files gnome_utilities -%dir %{_docdir}/patterns -%{_docdir}/patterns/gnome_utilities.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_utilities.txt %endif ################################################################################ @@ -744,18 +756,18 @@ Provides: pattern() = gnome_yast Provides: pattern-extends() = yast2_basis Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 1260 +Supplements: packageand(patterns-gnome-gnome:patterns-yast-yast2_basis) Provides: patterns-openSUSE-gnome_yast = %{version} Obsoletes: patterns-openSUSE-gnome_yast < %{version} Requires: libyui-qt-pkg Requires: yast2-control-center-qt -Supplements: packageand(patterns-gnome-gnome:patterns-yast-yast2_basis) %description gnome_yast Graphical YaST user interfaces for the GNOME desktop. %files gnome_yast -%dir %{_docdir}/patterns -%{_docdir}/patterns/gnome_yast.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/gnome_yast.txt %endif ################################################################################ @@ -769,20 +781,20 @@ Provides: pattern() = sw_management_gnome Provides: pattern-extends() = sw_management Provides: pattern-icon() = pattern-generic Provides: pattern-order() = 1780 -Provides: patterns-openSUSE-sw_management_gnome = %{version} -Obsoletes: patterns-openSUSE-sw_management_gnome < %{version} +Supplements: packageand(patterns-gnome-gnome_basis:patterns-base-sw_management) Requires: pattern() = sw_management Requires: pattern() = x11 +Provides: patterns-openSUSE-sw_management_gnome = %{version} +Obsoletes: patterns-openSUSE-sw_management_gnome < %{version} Recommends: gnome-packagekit Recommends: gnome-software -Supplements: packageand(patterns-gnome-gnome_basis:patterns-base-sw_management) %description sw_management_gnome Package Management - Graphical Tools %files sw_management_gnome -%dir %{_docdir}/patterns -%{_docdir}/patterns/sw_management_gnome.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/sw_management_gnome.txt %endif %prep @@ -791,10 +803,10 @@ Package Management - Graphical Tools %install -mkdir -p "%{buildroot}%{_docdir}/patterns" +mkdir -p "%{buildroot}/usr/share/doc/packages/patterns" for i in gnome gnome_basis gnome_basic gnome_imaging gnome_x11; do echo "This file marks the pattern $i to be installed." \ - >"%{buildroot}%{_docdir}/patterns/$i.txt" + >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt" done %if 0%{?is_opensuse} @@ -803,7 +815,7 @@ for i in devel_gnome gnome_basis_opt \ gnome_multimedia gnome_office \ gnome_utilities gnome_yast sw_management_gnome; do echo "This file marks the pattern $i to be installed." \ - >"%{buildroot}%{_docdir}/patterns/$i.txt" + >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt" done %endif From 9056a93c65426adc807a869c57bf697106f757b04397d3a48244139b9eb239ee Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 Apr 2018 15:50:44 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/patterns-gnome?expand=0&rev=30 --- patterns-gnome.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/patterns-gnome.spec b/patterns-gnome.spec index 0c99621..d511234 100644 --- a/patterns-gnome.spec +++ b/patterns-gnome.spec @@ -379,11 +379,9 @@ Obsoletes: patterns-sles-gnome-basic 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: pattern() = x11 Requires: gsettings-backend-dconf # bsc#1065945