Ana Guerrero 2024-11-24 10:04:00 +00:00 committed by Git OBS Bridge
commit 465a9fbdf9
2 changed files with 153 additions and 173 deletions

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Nov 12 16:57:52 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Replace tracker with tinysparql: tracker was renamed with GNOME
47.
-------------------------------------------------------------------
Tue Nov 12 16:53:39 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Some major overhaul over the GNOME patterns: allow to properly
have wayland or X11 decoupled from each other, stepping closer to
a wayland-only installation.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 7 15:33:57 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Thu Nov 7 15:33:57 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
@ -12,7 +25,7 @@ Thu Oct 31 10:06:27 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
- Change console to gnome-console Recommends: Use the current app - Change console to gnome-console Recommends: Use the current app
name. name.
- Drop nautilus-extension-terminal Recommends: nautilus supports - Drop nautilus-extension-terminal Recommends: nautilus supports
gnome-console nativly. gnome-console natively.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 26 07:41:43 UTC 2024 - Yifan Jiang <yfjiang@suse.com> Tue Mar 26 07:41:43 UTC 2024 - Yifan Jiang <yfjiang@suse.com>

View File

@ -16,9 +16,8 @@
# #
%bcond_with betatest
Name: patterns-gnome Name: patterns-gnome
Version: 20201210 Version: 20241112
Release: 0 Release: 0
Summary: Patterns for Installation (Gnome) Summary: Patterns for Installation (Gnome)
License: MIT License: MIT
@ -34,61 +33,31 @@ not make sense.
This particular package contains all the Gnome patterns. This particular package contains all the Gnome patterns.
%if 0%{?is_opensuse}
%package devel_gnome
%pattern_development
Summary: GNOME Development ################################################################################
%package gnome
%pattern_graphicalenvironments
Summary: GNOME Desktop Environment (Wayland)
Group: Metapackages Group: Metapackages
Provides: patterns-openSUSE-devel_gnome = %{version} Provides: pattern() = gnome
Provides: pattern() = devel_gnome Provides: pattern-icon() = pattern-gnome-wayland
Provides: pattern-icon() = pattern-gnome-devel Provides: pattern-order() = 1010
Provides: pattern-order() = 3160
Provides: pattern-visible() Provides: pattern-visible()
Obsoletes: patterns-openSUSE-devel_gnome < %{version} Requires: gnome-session-wayland
Requires: pattern() = devel_C_C++ Requires: pattern() = gnome_basic
Requires: pattern() = gnome_basis
Recommends: cairo-devel
Recommends: clutter-devel
Recommends: clutter-gst-devel
Recommends: clutter-gtk-devel
Recommends: evolution-data-server-devel
Recommends: gdk-pixbuf-devel
Recommends: glib2-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
Recommends: libgweather-devel
Recommends: libnotify-devel
Recommends: librsvg-devel
Recommends: libsoup-devel
Recommends: libwebkitgtk-devel
Recommends: libwnck-devel
Recommends: pango-devel
Recommends: tracker-devel
Recommends: vala
Recommends: vte-devel
Recommends: yelp-tools
%description devel_gnome %description gnome
GNOME development packages. 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 devel_gnome %files gnome
%dir %{_docdir}/patterns %dir %{_docdir}/patterns
%{_docdir}/patterns/devel_gnome.txt %{_docdir}/patterns/gnome.txt
%endif
################################################################################
%package gnome_x11 %package gnome_x11
%pattern_graphicalenvironments %pattern_graphicalenvironments
@ -98,8 +67,57 @@ Provides: pattern() = gnome_x11
Provides: pattern-icon() = pattern-gnome-xorg Provides: pattern-icon() = pattern-gnome-xorg
Provides: pattern-order() = 1020 Provides: pattern-order() = 1020
Provides: pattern-visible() Provides: pattern-visible()
# bsc#1065166 Requires: gnome-session-xsession
Requires: pattern() = gnome_basic Requires: pattern() = gnome_basic
Requires: pattern() = x11
################################################################################
%description gnome_x11
The GNOME desktop environment is an intuitive and attractive desktop for users.
This pattern installs a full featured GNOME desktop environment, including
Office suite, E-Mail client, Web Browser, File Manager, running with X11
technology.
%files gnome_x11
%dir %{_docdir}/patterns
%{_docdir}/patterns/gnome_x11.txt
################################################################################
%package gnome_basic
%pattern_graphicalenvironments
Summary: GNOME Desktop Environment (Basic)
Group: Metapackages
Provides: pattern() = gnome_basic
Provides: pattern-icon() = pattern-gnome
Provides: pattern-order() = 1000
Provides: pattern-visible()
Requires: gsettings-backend-dconf
Requires: pattern() = basesystem
Requires: pattern() = gnome_basis
Recommends: evince
# bsc#1065146
%if 0%{?sle_version}
Recommends: gedit
%else
Recommends: gnome-text-editor
%endif
Recommends: gnome-calculator %dnl bsc#1063156
Recommends: gnome-software
Recommends: gnome-system-monitor
Recommends: gnome-tweaks %dnl bnc#859494 bsc#1065790
Recommends: nautilus-share
Recommends: pinentry-gnome3
# bsc#1164858 bsc#1081584
# - only in Leap and SLE as we don't want to install gnome-packagekit by
# default on TW
%if 0%{?sle_version}
Recommends: gnome-packagekit
%endif
%if !0%{?is_opensuse}
Obsoletes: patterns-sles-gnome-basic
%endif
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
Recommends: pattern() = gnome_games Recommends: pattern() = gnome_games
Recommends: pattern() = gnome_internet Recommends: pattern() = gnome_internet
@ -107,11 +125,9 @@ Recommends: pattern() = gnome_utilities
Recommends: pattern() = imaging Recommends: pattern() = imaging
Recommends: pattern() = multimedia Recommends: pattern() = multimedia
%endif %endif
Requires: gnome-session-xsession
# #545263 # #545263
Requires: seahorse Requires: seahorse
Requires: totem Requires: totem
Requires: xdg-user-dirs-gtk
Recommends: pattern() = gnome_imaging Recommends: pattern() = gnome_imaging
Recommends: pattern() = office Recommends: pattern() = office
Recommends: pattern() = x11_yast Recommends: pattern() = x11_yast
@ -129,32 +145,25 @@ Recommends: evolution
Recommends: evolution-ews Recommends: evolution-ews
Recommends: gnome-backgrounds Recommends: gnome-backgrounds
Recommends: gnome-bluetooth Recommends: gnome-bluetooth
# bsc#1069699 Recommends: gnome-characters %dnl bsc#1069699
Recommends: gnome-characters
Recommends: gnome-clocks Recommends: gnome-clocks
# bsc#1069699 Recommends: gnome-contacts %dnl bsc#1069699
Recommends: gnome-contacts
Recommends: gnome-control-center-color Recommends: gnome-control-center-color
Recommends: gnome-control-center-goa Recommends: gnome-control-center-goa
Recommends: gnome-desktop Recommends: gnome-desktop
# #554954 Recommends: gnome-disk-utility %dnl boo#554954
Recommends: gnome-disk-utility
Recommends: gnome-remote-desktop Recommends: gnome-remote-desktop
Recommends: gpgme
Recommends: nautilus-sendto Recommends: nautilus-sendto
Recommends: noto-sans-cjk-fonts Recommends: noto-sans-cjk-fonts
Recommends: orca Recommends: orca
%if 0%{?sle_version} && !0%{?is_opensuse} %if 0%{?sle_version} && !0%{?is_opensuse}
# bsc#1065191 Recommends: pidgin %dnl bsc#1065191
Recommends: pidgin
Recommends: planner Recommends: planner
%endif %endif
Recommends: python3-speechd Recommends: python3-speechd
Recommends: speech-dispatcher Recommends: speech-dispatcher
Recommends: systemd-icon-branding Recommends: systemd-icon-branding
# #608156 Recommends: tinysparql %dnl boo#608156
Recommends: tracker
Recommends: tracker-miner-files
Recommends: zenity Recommends: zenity
Suggests: pattern() = documentation Suggests: pattern() = documentation
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
@ -173,14 +182,12 @@ Recommends: remmina
Recommends: gnome-initial-setup Recommends: gnome-initial-setup
%endif %endif
%if !0%{?is_opensuse} %if !0%{?is_opensuse}
# bsc#1075136 Recommends: gutenprint %dnl bsc#1075136
Recommends: gutenprint
%endif %endif
# #
# #447627 # #447627
%if !0%{?is_opensuse} %if !0%{?is_opensuse}
# bsc#1087222 Recommends: gnome-user-share %dnl bsc#1087222
Recommends: gnome-user-share
%else %else
Requires: gnome-user-share Requires: gnome-user-share
%endif %endif
@ -188,7 +195,7 @@ Requires: gnome-user-share
# #
# Official upstream # Official upstream
# #
# #544192 Recommends: gnome-console
Recommends: baobab Recommends: baobab
Recommends: gcr-viewer Recommends: gcr-viewer
Recommends: gnome-characters Recommends: gnome-characters
@ -213,9 +220,7 @@ Recommends: sushi
# Tool for advanced configuration of printers # Tool for advanced configuration of printers
Recommends: system-config-printer Recommends: system-config-printer
Recommends: totem-browser-plugin Recommends: totem-browser-plugin
Recommends: tracker-miner-evolution Suggests: gnome-color-manager %dnl bnc#698250
# bnc#698250
Suggests: gnome-color-manager
%else %else
Recommends: NetworkManager-openconnect-gnome Recommends: NetworkManager-openconnect-gnome
# bsc#1065148 # bsc#1065148
@ -225,36 +230,14 @@ Recommends: desktop-data-SLE-extra
%endif %endif
Recommends: malcontent-control Recommends: malcontent-control
%description gnome_x11 %description gnome_basic
The GNOME desktop environment is an intuitive and attractive desktop for users. The GNOME desktop environment is an intuitive and attractive desktop for users.
This pattern installs a full featured GNOME desktop environment, including This pattern installs GNOME desktop environment with only essential graphical
Office suite, E-Mail client, Web Browser, File Manager, running with X11 applications installed (File Manager, Web Browser).
technology.
%files gnome_x11 %files gnome_basic
%dir %{_docdir}/patterns %dir %{_docdir}/patterns
%{_docdir}/patterns/gnome_x11.txt %{_docdir}/patterns/gnome_basic.txt
################################################################################
%package gnome
%pattern_graphicalenvironments
Summary: GNOME Desktop Environment (Wayland)
Group: Metapackages
Provides: pattern() = gnome
Provides: pattern-icon() = pattern-gnome-wayland
Provides: pattern-order() = 1010
Provides: pattern-visible()
Requires: pattern() = gnome_x11
Recommends: gnome-session-wayland
%description gnome
The GNOME desktop environment is an intuitive and attractive desktop for users.
This pattern installs components for GNOME to run with Wayland and X11 technologies.
%files gnome
%dir %{_docdir}/patterns
%{_docdir}/patterns/gnome.txt
################################################################################ ################################################################################
@ -267,11 +250,9 @@ Provides: pattern-icon() = pattern-gnome
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
Provides: patterns-openSUSE-gnome_basis = %{version} Provides: patterns-openSUSE-gnome_basis = %{version}
Obsoletes: patterns-openSUSE-gnome_basis < %{version} Obsoletes: patterns-openSUSE-gnome_basis < %{version}
Recommends: pattern() = gnome_basis_opt
%endif %endif
Requires: gdm Requires: gdm
Requires: gnome-session Requires: gnome-session
Requires: pattern() = x11
# from data/COMMON-DESKTOP # from data/COMMON-DESKTOP
Recommends: desktop-data Recommends: desktop-data
Recommends: desktop-file-utils Recommends: desktop-file-utils
@ -289,10 +270,12 @@ Recommends: gnome-keyring-pam
#Requires: gnome-control-center #Requires: gnome-control-center
# Accessability is not an option, and performance issues if its missing (boo#1204564) # Accessability is not an option, and performance issues if its missing (boo#1204564)
Requires: at-spi2-core Requires: at-spi2-core
%if 0%{?sle_version}
# boo#1090117 # boo#1090117
Recommends: gnome-shell-classic Recommends: gnome-shell-classic
Recommends: gnome-console %endif
Recommends: gnome-extensions Recommends: gnome-extensions
# gnome-terminal is currently used all around in openQA - but should be removed
Recommends: gnome-terminal Recommends: gnome-terminal
# bnc#879466 # bnc#879466
Recommends: gnome-user-docs Recommends: gnome-user-docs
@ -350,79 +333,63 @@ Base packages for the GNOME desktop environment.
%{_docdir}/patterns/gnome_basis.txt %{_docdir}/patterns/gnome_basis.txt
################################################################################ ################################################################################
%package gnome_basic
%pattern_graphicalenvironments
Summary: GNOME Desktop Environment (Basic)
Group: Metapackages
Provides: pattern() = gnome_basic
Provides: pattern-icon() = pattern-gnome
Provides: pattern-order() = 1000
Provides: pattern-visible()
%if 0%{?is_opensuse}
Requires: pattern() = x11
%else
Requires: pattern() = x11_enhanced
%endif
Requires: gsettings-backend-dconf
Requires: pattern() = basesystem
Requires: pattern() = gnome_basis
Recommends: evince
# bsc#1065146
%if 0%{?sle_version}
Recommends: gedit
%else
Recommends: gnome-text-editor
%endif
# implified by gnome-keyring-pam
# Recommends: gnome-keyring
# bsc#1063156
Recommends: gnome-calculator
Recommends: gnome-software
Recommends: gnome-system-monitor
# bnc#859494 bsc#1065790
Recommends: gnome-tweaks
Recommends: nautilus-share
Recommends: pinentry-gnome3
# bsc#1164858 bsc#1081584
# - only in Leap and SLE as we don't want to install gnome-packagekit by
# default on TW
%if 0%{?sle_version}
Recommends: gnome-packagekit
%endif
%if !0%{?is_opensuse}
Obsoletes: patterns-sles-gnome-basic
%endif
%description gnome_basic
The GNOME desktop environment is an intuitive and attractive desktop for users.
This pattern installs GNOME desktop environment with only essential graphical
applications installed (File Manager, Web Browser).
%files gnome_basic
%dir %{_docdir}/patterns
%{_docdir}/patterns/gnome_basic.txt
################################################################################ ################################################################################
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
%package gnome_basis_opt %package devel_gnome
%pattern_graphicalenvironments %pattern_development
Summary: GNOME Base System Summary: GNOME Development
Group: Metapackages Group: Metapackages
Provides: patterns-openSUSE-gnome_basis_opt = %{version} Provides: patterns-openSUSE-devel_gnome = %{version}
Provides: pattern() = gnome_basis_opt Provides: pattern() = devel_gnome
Provides: pattern-extends() = gnome_basis Provides: pattern-icon() = pattern-gnome-devel
Provides: pattern-icon() = pattern-gnome Provides: pattern-order() = 3160
Provides: pattern-order() = 1420 Provides: pattern-visible()
Obsoletes: patterns-openSUSE-gnome_basis_opt < %{version} Obsoletes: patterns-openSUSE-devel_gnome < %{version}
Requires: pattern() = x11 Requires: pattern() = devel_C_C++
Requires: pattern() = gnome_basis
Recommends: cairo-devel
Recommends: clutter-devel
Recommends: clutter-gst-devel
Recommends: clutter-gtk-devel
Recommends: evolution-data-server-devel
Recommends: gdk-pixbuf-devel
Recommends: glib2-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
Recommends: libgweather-devel
Recommends: libnotify-devel
Recommends: librsvg-devel
Recommends: libsoup-devel
Recommends: libwebkitgtk-devel
Recommends: libwnck-devel
Recommends: pango-devel
Recommends: tinysparql-devel
Recommends: vala
Recommends: vte-devel
Recommends: yelp-tools
%description gnome_basis_opt %description devel_gnome
Base packages for the GNOME desktop environment. GNOME development packages.
%files gnome_basis_opt %files devel_gnome
%dir %{_docdir}/patterns %dir %{_docdir}/patterns
%{_docdir}/patterns/gnome_basis_opt.txt %{_docdir}/patterns/devel_gnome.txt
%endif %endif
################################################################################ ################################################################################
@ -752,7 +719,7 @@ Provides: pattern-icon() = pattern-generic
Provides: pattern-order() = 1780 Provides: pattern-order() = 1780
Obsoletes: patterns-openSUSE-sw_management_gnome < %{version} Obsoletes: patterns-openSUSE-sw_management_gnome < %{version}
Requires: pattern() = sw_management Requires: pattern() = sw_management
Requires: pattern() = x11 # gnome-packagekit needed for openQA - and allows fainer grained updates than Software
Recommends: gnome-packagekit Recommends: gnome-packagekit
Recommends: gnome-software Recommends: gnome-software
Supplements: packageand(patterns-gnome-gnome_basis:patterns-base-sw_management) Supplements: packageand(patterns-gnome-gnome_basis:patterns-base-sw_management)
@ -778,7 +745,7 @@ for i in gnome gnome_basis gnome_basic gnome_imaging gnome_x11 gnome_multimedia;
done done
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
for i in devel_gnome gnome_basis_opt \ for i in devel_gnome \
gnome_games gnome_ide gnome_internet \ gnome_games gnome_ide gnome_internet \
gnome_office \ gnome_office \
gnome_utilities gnome_yast sw_management_gnome; do gnome_utilities gnome_yast sw_management_gnome; do