From f716e3b5a4f31b469dd20ca6e883e751eb12134dc6945ba6d2fd6bd81f53f126 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 22 Sep 2017 12:49:31 +0000 Subject: [PATCH] Accepting request 528149 from home:simotek:branches:system:install:head - set many *_opt patterns to only build on openSUSE - Add some is_opensuse sections for packages not in SLE - Move certain packages from * to *_opt when they are not in SLE * x11 * xorg-x11-libX11-ccache * xorg-x11-driver-video-radeonhd * xorg-x11-driver-video-unichrome * xterm (xterm-bin added in place) * x11-tools - Move packages from x11-opt to x11 so x11-opt is openSUSE only * tk * xtermset - Rework of enhanced_base * Move from enhanced_base to enhanced_base_opt * Move from enhanced_base_opt to enhanced_base * cpupower * smartmontools * screen * xz (now recommended rather then suggested) * rsync * haveged * mcelog * zip * initviocons * zisofs-tools * irqbalance * pam_ssh * xfsprogs * dos2unix * Move or remove the following packages to console OBS-URL: https://build.opensuse.org/request/show/528149 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=39 --- patterns-base.changes | 90 +++++- patterns-base.spec | 638 ++++++++++++++++++++---------------------- 2 files changed, 387 insertions(+), 341 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index 976e2a4..c4b8f8f 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,12 +1,98 @@ +------------------------------------------------------------------- +Tue Sep 19 04:06:33 UTC 2017 - sflees@suse.de + +- set many *_opt patterns to only build on openSUSE +- Add some is_opensuse sections for packages not in SLE +- Move certain packages from * to *_opt when they are not in SLE + * x11 + * xorg-x11-libX11-ccache + * xorg-x11-driver-video-radeonhd + * xorg-x11-driver-video-unichrome + * xterm (xterm-bin added in place) + * x11-tools +- Move packages from x11-opt to x11 so x11-opt is openSUSE only + * tk + * xtermset +- Rework of enhanced_base + * Move from enhanced_base to enhanced_base_opt + * Move from enhanced_base_opt to enhanced_base + * cpupower + * smartmontools + * screen + * xz (now recommended rather then suggested) + * rsync + * haveged + * mcelog + * zip + * initviocons + * zisofs-tools + * irqbalance + * pam_ssh + * xfsprogs + * dos2unix + * Move or remove the following packages to console + * lynx + * at + * bc + * ed + * w3m +- Remove certain packages from patterns where they are not shipped + in SLE15 + * minimal_base + * insserv + * base + * systemd-logger + * console + * makedev + * par + * enhanced_base / enhanced_base_opt + * db-utils + * jfsutils + * libatm1 + * lsb-release + * ppp + * pptp + * utempter (only lib in factory) + * reiserfs + * ypbind + * yptools + * x11 + * freeglut (dropped from factory) + * fvwm2 + * fvwm-themes + * gv + * mmv + * pmidi + * suspend + * xorg-x11-driver-input (compatability meta package) + * xine-ui + * xosd + * xosview + * xpdf-poppler (dropped from factory) + * wine + * x11_opt + * freeglut (dropped from factory) +- Remove the 32 and 64bit patterns +- move ntp work around for boo#936378 to patterns-yast +- remove systemd from enhanced_base_opt (already included elsewhere) +- swap SuSEfirewall2 to firewalld following SLE-15 +- no longer recommend alternate shells (users who want to change know how to + install them) + * ksh + * tcsh + * zsh +- Recommend nano in enhanced_base boo#1034493 +- Console pattern only recommends things not requires them +- tgt removed (in yast where it shoud be) +- open-iscsi just needs to be in the media patterns boo#393589 + ------------------------------------------------------------------- Mon Sep 18 08:17:56 UTC 2017 - dleuenberger@suse.com - Add libnss_compat2 and libnss_nis2 to minimal_base: they were integrated into glibc before. - ------------------------------------------------------------------- Wed Aug 30 15:10:53 UTC 2017 - dimstar@opensuse.org - - Introduce a wrapper pattern 'basesystem'. One pattern cannot provide two names. This is likely to disappear soon again, but helps for an easier migration/cleanup run (and fixes diff --git a/patterns-base.spec b/patterns-base.spec index 4045cef..04f2530 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -36,63 +36,30 @@ This particular package contains all the base / core patterns (and those that do ################################################################################ -%package 32bit -Summary: 32-Bit Runtime Environment -Group: Metapackages -Provides: patterns-openSUSE-32bit = %{version} -Provides: pattern() = 32bit -Provides: pattern-icon() = yast-misc -Provides: pattern-order() = 1140 -Obsoletes: patterns-openSUSE-32bit < %{version} -%pattern_basetechnologies - -%description 32bit -This pattern installs the 32-bit variant of all selected patterns, allowing you to execute 32-bit software. - -%files 32bit -%dir %{_docdir}/patterns -%{_docdir}/patterns/32bit.txt - -################################################################################ - -%package 64bit -Summary: 64-Bit Runtime Environment -Group: Metapackages -Provides: patterns-openSUSE-64bit = %{version} -Provides: pattern() = 64bit -Provides: pattern-icon() = yast-misc -Provides: pattern-order() = 1160 -Obsoletes: patterns-openSUSE-64bit < %{version} -%pattern_basetechnologies - -%description 64bit -This pattern installs the 64-bit variant of all selected patterns, allowing you to execute 64-bit software. - -%files 64bit -%dir %{_docdir}/patterns -%{_docdir}/patterns/64bit.txt - -################################################################################ - %package apparmor +%pattern_basetechnologies Summary: AppArmor Group: Metapackages -Requires: apparmor-abstractions -Requires: apparmor-parser -Requires: apparmor-profiles -Requires: audit -Requires: pattern() = minimal_base -Recommends: apparmor-utils -Recommends: pattern() = apparmor_opt -Recommends: yast2-apparmor -Suggests: pam_apparmor Provides: patterns-openSUSE-apparmor = %{version} Provides: pattern() = apparmor Provides: pattern-icon() = pattern-apparmor Provides: pattern-order() = 1100 Provides: pattern-visible() Obsoletes: patterns-openSUSE-apparmor < %{version} -%pattern_basetechnologies +Requires: pattern() = minimal_base +%if 0%{?is_opensuse} +Recommends: pattern() = apparmor_opt +%endif + +Requires: apparmor-abstractions +Requires: apparmor-parser +Requires: apparmor-profiles +Recommends: yast2-apparmor +Suggests: pam_apparmor +%if 0%{?is_opensuse} +Requires: audit +Recommends: apparmor-utils +%endif %description apparmor AppArmor is an application security framework that provides mandatory access control for programs. It protects from exploitation of software flaws and compromised systems. It offers an advanced tool set that automates the development of per-program application security without requiring additional knowledge. @@ -103,18 +70,20 @@ AppArmor is an application security framework that provides mandatory access con ################################################################################ +%if 0%{?is_opensuse} %package apparmor_opt +%pattern_basetechnologies Summary: AppArmor Group: Metapackages -Requires: apparmor-docs -Requires: pattern() = minimal_base Provides: patterns-openSUSE-apparmor_opt = %{version} Provides: pattern() = apparmor_opt Provides: pattern-extends() = apparmor Provides: pattern-icon() = apparmor%2Fapp_armor.png Provides: pattern-order() = 1080 Obsoletes: patterns-openSUSE-apparmor_opt < %{version} -%pattern_basetechnologies +Requires: pattern() = minimal_base + +Requires: apparmor-docs %description apparmor_opt AppArmor is an application security framework that provides mandatory access control for programs. It protects from exploitation of software flaws and compromised systems. It offers an advanced tool set that automates the development of per-program application security without requiring additional knowledge. @@ -122,16 +91,17 @@ AppArmor is an application security framework that provides mandatory access con %files apparmor_opt %dir %{_docdir}/patterns %{_docdir}/patterns/apparmor_opt.txt +%endif ################################################################################ %package basesystem +%pattern_basetechnologies Summary: Base System (alias pattern for base) Group: Metapackages Requires: pattern() = minimal_base Provides: pattern() = basesystem Provides: pattern-icon() = pattern-basis -%pattern_basetechnologies %description basesystem This is the base runtime system. It contains only a minimal multiuser booting system. For running on real hardware, you need to add additional packages and pattern to make this pattern useful on its own. @@ -143,11 +113,19 @@ This is the base runtime system. It contains only a minimal multiuser booting s ################################################################################ %package base +%pattern_basetechnologies Summary: Base System Group: Metapackages +Provides: patterns-openSUSE-base = %{version} +Provides: pattern() = base +Provides: pattern-icon() = pattern-basis +Provides: pattern-order() = 1020 +Provides: pattern-visible() +Obsoletes: patterns-openSUSE-base < %{version} +Requires: pattern() = minimal_base + Requires: kbd Requires: openssh -Requires: pattern() = minimal_base Requires: polkit Requires: polkit-default-privs Requires: rpm @@ -155,16 +133,6 @@ Requires: shadow Requires: util-linux Requires: which Recommends: ca-certificates-mozilla -# Recommend NTP at least until boo#936378 is fixed and YaST is not trying to configure a service that's not there -Recommends: ntp -Suggests: systemd-logger -Provides: patterns-openSUSE-base = %{version} -Provides: pattern() = base -Provides: pattern-icon() = pattern-basis -Provides: pattern-order() = 1020 -Provides: pattern-visible() -Obsoletes: patterns-openSUSE-base < %{version} -%pattern_basetechnologies %ifarch ppc Recommends: libbspe # #739878 - install pdisk by default @@ -202,59 +170,58 @@ This is the base runtime system. It contains only a minimal multiuser booting s ################################################################################ %package console +%pattern_basetechnologies Summary: Console Tools Group: Metapackages -Requires: mc -Requires: openssh -Requires: pattern() = enhanced_base -Requires: w3m -Recommends: command-not-found -Recommends: emacs-nox -Recommends: libyui-ncurses -Recommends: libyui-ncurses-pkg -Recommends: mosh -Recommends: mtools -Recommends: ntp -Recommends: pattern() = yast2_basis -Recommends: rsync -Recommends: screen -Recommends: sensors -Recommends: susepaste -Recommends: susepaste-screenshot -Recommends: tmux -Recommends: vim -Suggests: alpine -Suggests: bsd-games -Suggests: cnetworkmanager -Suggests: convert -# #378747 -Suggests: cryptconfig -Suggests: dar -Suggests: ding -Suggests: gcal -Suggests: grepmail -Suggests: irssi -Suggests: lftp -Suggests: links -Suggests: makedev -Suggests: minicom -Suggests: mlocate -Suggests: mutt -Suggests: nano -Suggests: ncftp -Suggests: par -Suggests: pico -Suggests: pinfo -Suggests: slrn -Suggests: units -Suggests: vlock Provides: patterns-openSUSE-console = %{version} Provides: pattern() = console Provides: pattern-icon() = yast-system Provides: pattern-order() = 1120 Provides: pattern-visible() Obsoletes: patterns-openSUSE-console < %{version} -%pattern_basetechnologies +Requires: pattern() = enhanced_base +Recommends: pattern() = yast2_basis + +Recommends: ed +Recommends: emacs-nox +Recommends: w3m +# #378747 +Suggests: cryptconfig +Suggests: lftp +Suggests: mlocate +Suggests: mutt +%if 0%{?is_opensuse} +Recommends: at +Recommends: bc +Recommends: libyui-ncurses +Recommends: libyui-ncurses-pkg +Recommends: mc +Recommends: mosh +Recommends: mtools +Recommends: ntp +Recommends: sensors +Recommends: susepaste +Recommends: susepaste-screenshot +Recommends: tmux +Suggests: alpine +Suggests: bsd-games +Suggests: cnetworkmanager +Suggests: convert +Suggests: dar +Suggests: ding +Suggests: gcal +Suggests: grepmail +Suggests: irssi +Suggests: links +Suggests: lynx +Suggests: minicom +Suggests: ncftp +Suggests: pico +Suggests: pinfo +Suggests: slrn +Suggests: units +Suggests: vlock +%endif %description console Applications useful for those using the console and no graphical desktop environment. @@ -266,11 +233,23 @@ Applications useful for those using the console and no graphical desktop environ ################################################################################ %package enhanced_base +%pattern_basetechnologies Summary: Enhanced Base System Group: Metapackages +Provides: patterns-openSUSE-enhanced_base = %{version} +Provides: pattern() = enhanced_base +Provides: pattern-icon() = pattern-basis +Provides: pattern-order() = 1060 +Provides: pattern-visible() +Obsoletes: patterns-openSUSE-enhanced_base < %{version} Requires: pattern() = base +Recommends: pattern() = apparmor +Recommends: pattern() = enhanced_base_opt +Recommends: pattern() = sw_management +Recommends: pattern() = yast2_basis + # firewall by default -Recommends: SuSEfirewall2 +Recommends: firewalld Recommends: aaa_base-extras # getfacl and setfacl Recommends: acl @@ -300,14 +279,11 @@ Recommends: cyrus-sasl-gssapi Recommends: cyrus-sasl-plain # bnc#430895 # cyrus-sasl-saslauthd -Recommends: db-utils # delta rpms are considered cool for updates Recommends: deltarpm Recommends: diffutils -Recommends: dmraid -Recommends: dosfstools +Recommends: dos2unix Recommends: e2fsprogs -Recommends: ethtool Recommends: file Recommends: fillup Recommends: findutils @@ -318,29 +294,23 @@ Recommends: glibc-locale Recommends: gpart Recommends: gpg2 Recommends: gpm -# we want a branded grub2 too #757683 -Recommends: grub2-branding-openSUSE Recommends: hdparm Recommends: hwinfo -Recommends: ifplugd Recommends: info +Recommends: initviocons # /bin/ip considered useful Recommends: iproute2 # ping is required for network tests Recommends: iputils -Recommends: klogd +Recommends: irqbalance # #303857 Recommends: kpartx # pager Recommends: less -Recommends: libatm1 -Recommends: lsb-release -Recommends: lsof Recommends: lsscsi Recommends: mailx # man by default (#304687) Recommends: man -Recommends: master-boot-code # needed for detecting software raid - required by yast2-storage too Recommends: mdadm # split out of ncurses @@ -350,79 +320,50 @@ Recommends: netcfg Recommends: nfs-client Recommends: nfsidmap Recommends: nscd -# mount NTFS rw -Recommends: ntfs-3g -Recommends: ntfsprogs -Recommends: ntp -Recommends: openldap2-client Recommends: openslp # we want a ssh server to be available Recommends: openssh Recommends: parted -Recommends: pattern() = apparmor -Recommends: pattern() = enhanced_base_opt -Recommends: pattern() = sw_management -Recommends: pattern() = yast2_basis Recommends: pciutils Recommends: perl-base -# Make plymouth the new default bootsplash -Recommends: plymouth -# we want a branded boot -Recommends: plymouth-branding-openSUSE Recommends: postfix -Recommends: ppp -Recommends: pptp -Recommends: prctl -# fuser (psmisc) by default (#304694) -Recommends: psmisc -Recommends: recode -Recommends: release-notes-openSUSE +Recommends: rsync # Bug 424707 - Feature "Command not found" for openSUSE by default Recommends: scout +Recommends: screen Recommends: sg3_utils -Recommends: smp_utils -# useful for debugging -Recommends: strace -Recommends: sudo +Recommends: smartmontools Recommends: sysconfig -Recommends: syslinux Recommends: systemd-sysvinit Recommends: tar Recommends: time Recommends: timezone -# having a ftp command line client is good for moving log files -Recommends: tnftp -Recommends: tuned Recommends: udev # autoconfig new printers - bnc#808014 Recommends: udev-configure-printer # lsusb is good for debugging USB devices - #401593 Recommends: usbutils -Recommends: utempter # Our editor of choice Recommends: vim Recommends: wget -Recommends: wireless-tools -Recommends: wol -Recommends: yp-tools -Recommends: ypbind -Suggests: reiserfs -Provides: patterns-openSUSE-enhanced_base = %{version} -Provides: pattern() = enhanced_base -Provides: pattern-icon() = pattern-basis -Provides: pattern-order() = 1060 -Provides: pattern-visible() -Obsoletes: patterns-openSUSE-enhanced_base < %{version} -%pattern_basetechnologies +Recommends: xz +Recommends: zisofs-tools +# DELL computers mainly #403270, but #441079 +Suggests: biosdevname +Suggests: cpupower +# #437252 +Suggests: pam_ssh +Suggests: xfsprogs +Suggests: zip %ifarch aarch64 %ix86 x86_64 Recommends: dmidecode %endif -%ifarch %ix86 x86_64 -Recommends: acpica +# Current systems suffer from entropy starvation +%ifarch aarch64 %ix86 x86_64 ppc64 ppc64le +Recommends: haveged %endif -%ifarch %ix86 x86_64 -Recommends: ucode-amd -Recommends: ucode-intel +%ifarch ppc +Recommends: hfsutils %endif %ifarch ppc # #303737 @@ -430,9 +371,60 @@ Recommends: mouseemu Recommends: pdisk Recommends: powerpc32 %endif +# openSUSE Branding packages first +%if 0%{?is_opensuse} +# Make plymouth the new default bootsplash +# we want a branded grub2 too #757683 +Recommends: grub2-branding-openSUSE +Recommends: plymouth +# we want a branded boot +Recommends: plymouth-branding-openSUSE +Recommends: release-notes-openSUSE +%endif +# Other packages we have in openSUSE and not SLE-15 +%if 0%{?is_opensuse} +Recommends: dmraid +Recommends: dosfstools +Recommends: ethtool +Recommends: ifplugd +Recommends: klogd +Recommends: lsof +Recommends: master-boot-code +# boo#1034493 +Recommends: nano +# mount NTFS rw +Recommends: ntfs-3g +Recommends: ntfsprogs +Recommends: ntp +Recommends: openldap2-client +Recommends: prctl +# fuser (psmisc) by default (#304694) +Recommends: psmisc +Recommends: recode +Recommends: smp_utils +# useful for debugging +Recommends: strace +Recommends: sudo +Recommends: syslinux +# having a ftp command line client is good for moving log files +Recommends: tnftp +Recommends: tuned +Recommends: wireless-tools +Recommends: wol +%ifarch %ix86 x86_64 +Recommends: acpica +%endif +%ifarch x86_64 +Recommends: mcelog +%endif %ifarch aarch64 x86_64 Recommends: numactl %endif +%ifarch %ix86 x86_64 +Recommends: ucode-amd +Recommends: ucode-intel +%endif +%endif %description enhanced_base This is the enhanced base runtime system with lots of convenience packages. @@ -444,23 +436,33 @@ This is the enhanced base runtime system with lots of convenience packages. ################################################################################ %package enhanced_base_opt +%pattern_basetechnologies Summary: Enhanced Base System Group: Metapackages +Provides: patterns-openSUSE-enhanced_base_opt = %{version} +Provides: pattern() = enhanced_base_opt +Provides: pattern-extends() = enhanced_base +Provides: pattern-icon() = yast-software +Provides: pattern-order() = 1040 +Obsoletes: patterns-openSUSE-enhanced_base_opt < %{version} + Recommends: OpenPrintingPPDs -Recommends: at -Recommends: bc Recommends: cracklib-dict-full -Recommends: dos2unix -Recommends: ed -Recommends: finger Recommends: groff -Recommends: initviocons -Recommends: irqbalance +Recommends: man-pages-posix +# needed as soon as you want to do kerberos authentication +Suggests: cyrus-sasl-gssapi +Suggests: hfsutils +Suggests: unzip +# #754959 +%ifarch %ix86 x86_64 +Suggests: hyper-v +%endif +%if 0%{?is_opensuse} +Recommends: finger Recommends: joe -Recommends: ksh Recommends: ksymoops Recommends: man-pages -Recommends: man-pages-posix Recommends: manufacturer-PPDs Recommends: mpt-status Recommends: perl-TermReadLine-Gnu @@ -468,74 +470,26 @@ Recommends: prctl Recommends: procinfo Recommends: procmail Recommends: providers -Recommends: rsync -Recommends: screen Recommends: setserial Recommends: sharutils -Recommends: smartmontools Recommends: spax Recommends: strace Recommends: tcpdump -Recommends: tcsh Recommends: telnet Recommends: terminfo Recommends: vlan -Recommends: w3m Recommends: wol -Recommends: zisofs-tools -Recommends: zsh Suggests: acpid -# DELL computers mainly #403270, but #441079 -Suggests: biosdevname -Suggests: cpupower -# needed as soon as you want to do kerberos authentication -Suggests: cyrus-sasl-gssapi Suggests: delayacct-utils -Suggests: efibootmgr -Suggests: hfsutils -Suggests: jfsutils # bnc#388570 Suggests: kerneloops -Suggests: lynx Suggests: ocfs2-tools -# #393589 -Suggests: open-iscsi -# #437252 -Suggests: pam_ssh Suggests: pwgen -# debugging boot - Was systemd-analyze -Suggests: systemd -# used by yast2-iscsi-server -Suggests: tgt -Suggests: unzip Suggests: w3m-el # delta apply Suggests: xdelta # tool for xfs Suggests: xfsdump -Suggests: xfsprogs -Suggests: xz -Suggests: zip -Provides: patterns-openSUSE-enhanced_base_opt = %{version} -Provides: pattern() = enhanced_base_opt -Provides: pattern-extends() = enhanced_base -Provides: pattern-icon() = yast-software -Provides: pattern-order() = 1040 -Obsoletes: patterns-openSUSE-enhanced_base_opt < %{version} -%pattern_basetechnologies -%ifarch ppc -Recommends: hfsutils -%endif -# Current systems suffer from entropy starvation -%ifarch aarch64 %ix86 x86_64 ppc64 ppc64le -Recommends: haveged -%endif -%ifarch x86_64 -Recommends: mcelog -%endif -# #754959 -%ifarch %ix86 x86_64 -Suggests: hyper-v %endif %description enhanced_base_opt @@ -548,8 +502,16 @@ This is the enhanced base runtime system with lots of convenience packages. ################################################################################ %package minimal_base +%pattern_basetechnologies Summary: Base System Group: Metapackages +Provides: patterns-openSUSE-minimal_base = %{version} +Provides: pattern() = minimal_base +Provides: pattern-icon() = yast-sw_single +Provides: pattern-order() = 5190 +Provides: pattern-visible() +Obsoletes: patterns-openSUSE-minimal_base < %{version} + Requires: aaa_base Requires: bash Requires: coreutils @@ -576,7 +538,6 @@ Recommends: btrfsmaintenance Recommends: btrfsprogs Recommends: elfutils Recommends: grub2 -Recommends: insserv Recommends: iproute2 Recommends: openssh Recommends: pattern() = minimal_base_conflicts @@ -589,13 +550,6 @@ Recommends: system-user-daemon Recommends: sysvinit-tools Recommends: udev Suggests: ed -Provides: patterns-openSUSE-minimal_base = %{version} -Provides: pattern() = minimal_base -Provides: pattern-icon() = yast-sw_single -Provides: pattern-order() = 5190 -Provides: pattern-visible() -Obsoletes: patterns-openSUSE-minimal_base < %{version} -%pattern_basetechnologies %if 0%{?is_opensuse} Requires: openSUSE-build-key Requires: openSUSE-release @@ -618,18 +572,40 @@ This is the minimal openSUSE runtime system. It is really a minimal system, you ################################################################################ %package minimal_base_conflicts +%pattern_basetechnologies Summary: Base System Group: Metapackages +Provides: patterns-openSUSE-minimal_base-conflicts = %{version} +Provides: pattern() = minimal_base_conflicts +Provides: pattern-icon() = yast-sw_single +Provides: pattern-order() = 5191 +Obsoletes: patterns-openSUSE-minimal_base-conflicts < %{version} Requires: pattern() = minimal_base -Conflicts: bash-doc -Conflicts: bundle-lang-gnome-extras-en + Conflicts: cups-client -# required by gio-branding -Conflicts: desktop-data-openSUSE Conflicts: desktop-translations Conflicts: glib-networking # supplements into glib Conflicts: gsettings-backend-dconf +Conflicts: gvfs +# systemd recommends dbus-1-python +Conflicts: python +# python-base ~ 20MB +Conflicts: python-base +# recommended by yast2-printer +Conflicts: samba-client +Conflicts: vim-data +# requires all kinds of perl modules +Conflicts: xdg-utils +# requires python +Conflicts: zypper-log +%if 0%{?is_opensuse} +# required by gio-branding +Conflicts: desktop-data-openSUSE +%endif +%if 0%{?is_opensuse} +Conflicts: bash-doc +Conflicts: bundle-lang-gnome-extras-en # perl ~ 40MB ## - we can't conflict with that as perl-Bootloader-YAML needs it #Conflicts: perl # binutils ~ 30MB @@ -645,34 +621,17 @@ Conflicts: gtk3-immodule-inuktitut Conflicts: gtk3-immodule-thai Conflicts: gtk3-immodule-tigrigna Conflicts: gtk3-immodule-vietnamese -Conflicts: gvfs # supplements libgio and wget (TODO) Conflicts: libproxy1-config-gnome3 Conflicts: netpbm # requires X11 Conflicts: openssh-askpass Conflicts: perl-doc -# systemd recommends dbus-1-python -Conflicts: python -# python-base ~ 20MB -Conflicts: python-base Conflicts: readline-doc -# recommended by yast2-printer -Conflicts: samba-client Conflicts: smtp_daemon -Conflicts: vim-data -# requires all kinds of perl modules -Conflicts: xdg-utils # supplements yast2, not needed for ncurses only Conflicts: yast2-branding -# requires python -Conflicts: zypper-log -Provides: patterns-openSUSE-minimal_base-conflicts = %{version} -Provides: pattern() = minimal_base_conflicts -Provides: pattern-icon() = yast-sw_single -Provides: pattern-order() = 5191 -Obsoletes: patterns-openSUSE-minimal_base-conflicts < %{version} -%pattern_basetechnologies +%endif %description minimal_base_conflicts This is the base runtime system. It contains only a minimal multiuser booting system. For running on real hardware, you need to add additional packages and pattern to make this pattern useful on its own. @@ -684,18 +643,20 @@ This is the base runtime system. It contains only a minimal multiuser booting s ################################################################################ %package sw_management +%pattern_basetechnologies Summary: Software Management Group: Metapackages -# Zypper is the basic sw_management stack for *SUSE -Requires: zypper -Recommends: pattern() = sw_management_x11 Provides: patterns-openSUSE-sw_management = %{version} Provides: pattern() = sw_management Provides: pattern-icon() = yast-sw_single Provides: pattern-order() = 1360 Provides: pattern-visible() Obsoletes: patterns-openSUSE-sw_management < %{version} -%pattern_basetechnologies +Recommends: pattern() = sw_management_x11 + +# Zypper is the basic sw_management stack for *SUSE +Requires: zypper + %if 0%{?sle_version} Recommends: lifecycle-data Recommends: zypper-lifecycle-plugin @@ -711,21 +672,22 @@ This pattern provides a graphical application and a command line tool for keepin ################################################################################ %package update_test +%pattern_basetechnologies Summary: Tests for the Update Stack Group: Metapackages -Recommends: update-test-affects-package-manager -Recommends: update-test-interactive -Recommends: update-test-optional -Recommends: update-test-reboot-needed -Recommends: update-test-security -Recommends: update-test-trival Provides: patterns-openSUSE-update_test = %{version} Provides: pattern() = update_test Provides: pattern-icon() = yast-update Provides: pattern-order() = 1380 Provides: pattern-visible() Obsoletes: patterns-openSUSE-update_test < %{version} -%pattern_basetechnologies + +Recommends: update-test-affects-package-manager +Recommends: update-test-interactive +Recommends: update-test-optional +Recommends: update-test-reboot-needed +Recommends: update-test-security +Recommends: update-test-trival %if %{with betatest} Recommends: aaa_base-malloccheck Supplements: %{name}-base @@ -741,69 +703,54 @@ Packages used for testing that the update stack works. These tiny packages do n ################################################################################ %package x11 +%pattern_graphicalenvironments Summary: X Window System Group: Metapackages -Requires: pattern() = enhanced_base -Requires: pattern() = fonts -Recommends: command-not-found -# improve glxinfo output (#301647) -Recommends: freeglut -Recommends: ghostscript-x11 -# chooce icewm-default if you have a choice -# icewm-lite is too lightweight in new release -Recommends: icewm-default -# people love having numlock configurable -Recommends: numlockx -Recommends: openssh-askpass -Recommends: pattern() = x11_opt -Recommends: pattern() = x11_yast -Recommends: susepaste -Recommends: susepaste-screenshot -Recommends: tigervnc -# #353229 - drag in empty replacements -Recommends: translation-update -# needed e.g. for nvidia drivers -# #302566 -Recommends: x11-tools -Recommends: xauth -Recommends: xkeyboard-config -Recommends: xorg-x11-driver-input -Recommends: xorg-x11-driver-video -# provides e.g. xdm -Recommends: xorg-x11-essentials -Recommends: xorg-x11-libX11-ccache -Recommends: xorg-x11-server -Recommends: xterm -# #394406 -Suggests: desktop-data-openSUSE-extra -Suggests: fvwm-themes -Suggests: fvwm2 -Suggests: gv -Suggests: gvim -Suggests: hexchat -# required by others -Suggests: icewm -Suggests: mmv -Suggests: pmidi -Suggests: wine -Suggests: wpa_supplicant-gui -Suggests: xine-ui -Suggests: xorg-x11-driver-video-radeonhd -Suggests: xorg-x11-driver-video-unichrome -Suggests: xosd -Suggests: xosview -# on security probation -Suggests: xpdf-poppler Provides: patterns-openSUSE-x11 = %{version} Provides: pattern() = x11 Provides: pattern-icon() = yast-x11 Provides: pattern-order() = 1800 Provides: pattern-visible() Obsoletes: patterns-openSUSE-x11 < %{version} -%pattern_graphicalenvironments -# interesting for workstations too -%ifarch %ix86 x86_64 -Recommends: suspend +Requires: pattern() = enhanced_base +Requires: pattern() = fonts +Recommends: pattern() = x11_yast +%if 0%{?is_opensuse} +Recommends: pattern() = x11_opt +%endif + +Recommends: command-not-found +Recommends: ghostscript-x11 +# chooce icewm-default if you have a choice +# icewm-lite is too lightweight in new release +Recommends: icewm-default +Recommends: tigervnc +# #353229 - drag in empty replacements +Recommends: translation-update +Recommends: xauth +Recommends: xkeyboard-config +Recommends: xorg-x11-driver-video +# provides e.g. xdm +Recommends: xorg-x11-essentials +Recommends: xorg-x11-server +Recommends: xterm-bin +Recommends: xtermset +Suggests: gvim +Suggests: hexchat +# required by others +Suggests: icewm +Suggests: tk +%if 0%{?is_opensuse} +# #394406 +Suggests: desktop-data-openSUSE-extra +%endif +%if 0%{?is_opensuse} +# people love having numlock configurable +Recommends: numlockx +Recommends: openssh-askpass +Recommends: susepaste +Recommends: susepaste-screenshot +Suggests: wpa_supplicant-gui %endif %description x11 @@ -815,30 +762,35 @@ The X Window System provides the only standard platform-independent networked gr ################################################################################ +%if 0%{?is_opensuse} %package x11_opt +%pattern_graphicalenvironments Summary: X Window System Group: Metapackages -Requires: pattern() = enhanced_base -Requires: pattern() = fonts -Recommends: freeglut -Recommends: xdmbgrd -Recommends: xtermset -Suggests: MozillaThunderbird -Suggests: WindowMaker -Suggests: WindowMaker-applets -Suggests: WindowMaker-themes -Suggests: tk -Suggests: unclutter -Suggests: xlockmore -# #389816 -Suggests: xorg-x11-server-sdk Provides: patterns-openSUSE-x11_opt = %{version} Provides: pattern() = x11_opt Provides: pattern-extends() = x11 Provides: pattern-icon() = yast-x11 Provides: pattern-order() = 1680 Obsoletes: patterns-openSUSE-x11_opt < %{version} -%pattern_graphicalenvironments +Requires: pattern() = enhanced_base +Requires: pattern() = fonts + +# needed e.g. for nvidia drivers +# #302566 +Recommends: x11-tools +Recommends: xdmbgrd +Recommends: xorg-x11-libX11-ccache +Suggests: xorg-x11-driver-video-radeonhd +Suggests: xorg-x11-driver-video-unichrome +Suggests: MozillaThunderbird +Suggests: WindowMaker +Suggests: WindowMaker-applets +Suggests: WindowMaker-themes +Suggests: unclutter +Suggests: xlockmore +# #389816 +Suggests: xorg-x11-server-sdk %description x11_opt The X Window System provides the only standard platform-independent networked graphical window system bridging the heterogeneous platforms in today's enterprise: from network servers to desktops, thin clients, laptops, and handhelds, independent of operating system and hardware. @@ -846,10 +798,12 @@ The X Window System provides the only standard platform-independent networked gr %files x11_opt %dir %{_docdir}/patterns %{_docdir}/patterns/x11_opt.txt +%endif ################################################################################ %package x86 +%pattern_basetechnologies Summary: x86 Runtime Environment Group: Metapackages Provides: patterns-openSUSE-x86 = %{version} @@ -858,7 +812,7 @@ Provides: pattern-icon() = yast-misc Provides: pattern-order() = 1180 Provides: pattern-visible() Obsoletes: patterns-openSUSE-x86 < %{version} -%pattern_basetechnologies + %ifarch x86_64 Recommends: glibc-32bit Recommends: glibc-locale-32bit @@ -879,11 +833,17 @@ This will install the 32-bit variant of all selected patterns. This allows to ex %install mkdir -p %{buildroot}%{_docdir}/patterns -for i in 32bit 64bit apparmor apparmor_opt base basesystem console enhanced_base \ +%if 0%{?is_opensuse} +for i in apparmor apparmor_opt base basesystem console enhanced_base \ enhanced_base_opt minimal_base minimal_base_conflicts sw_management \ update_test x11 x11_opt x86; do - echo "This file marks the pattern $i to be installed." \ - >"%{buildroot}%{_docdir}/patterns/$i.txt" +%else +for i in apparmor base basesystem console enhanced_base \ + enhanced_base_opt minimal_base minimal_base_conflicts sw_management \ + update_test x11 x86; do +%endif + echo "This file marks the pattern $i to be installed." \ + >"%{buildroot}%{_docdir}/patterns/$i.txt" done %changelog