From ec10b2fc5037e2c00e4521bc23f4de929dc352d35414107162bb2eb425511854 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 8 Jun 2017 13:18:41 +0000 Subject: [PATCH 1/8] - Cleanup patterns: a pattern definition is not allowed to have multiple Provides: patter() = FOO, as only one of them is seen by libsolv. OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=24 --- patterns-base.changes | 7 +++++++ patterns-base.spec | 9 ++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index 9014eeb..7004254 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 8 13:17:51 UTC 2017 - dimstar@opensuse.org + +- Cleanup patterns: a pattern definition is not allowed to have + multiple Provides: patter() = FOO, as only one of them is seen + by libsolv. + ------------------------------------------------------------------- Thu Jun 8 09:49:25 UTC 2017 - dimstar@opensuse.org diff --git a/patterns-base.spec b/patterns-base.spec index b6cb216..736c3bd 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -87,7 +87,7 @@ Provides: pattern-icon() = pattern-apparmor Provides: pattern-order() = 1100 Provides: pattern-visible() Obsoletes: patterns-openSUSE-apparmor < %{version} -Requires: pattern() = basesystem +Requires: pattern() = base Recommends: pattern() = apparmor_opt Requires: apparmor-abstractions @@ -117,7 +117,7 @@ Provides: pattern-extends() = apparmor Provides: pattern-icon() = apparmor%2Fapp_armor.png Provides: pattern-order() = 1080 Obsoletes: patterns-openSUSE-apparmor_opt < %{version} -Requires: pattern() = basesystem +Requires: pattern() = base Requires: apparmor-docs @@ -136,7 +136,6 @@ Summary: Base System Group: Metapackages Provides: patterns-openSUSE-base = %{version} Provides: pattern() = base -Provides: pattern() = basesystem Provides: pattern-icon() = pattern-basis Provides: pattern-order() = 1020 Provides: pattern-visible() @@ -267,7 +266,6 @@ Provides: pattern-order() = 1060 Provides: pattern-visible() Obsoletes: patterns-openSUSE-enhanced_base < %{version} Requires: pattern() = base -Requires: pattern() = basesystem Recommends: pattern() = apparmor Recommends: pattern() = yast2_basis Recommends: pattern() = enhanced_base_opt @@ -552,7 +550,6 @@ This is the enhanced base runtime system with lots of convenience packages. Summary: Base System Group: Metapackages Provides: patterns-openSUSE-minimal_base = %{version} -Provides: pattern() = basesystem Provides: pattern() = minimal_base Provides: pattern-icon() = yast-sw_single Provides: pattern-order() = 5190 @@ -751,7 +748,6 @@ Provides: pattern-icon() = yast-x11 Provides: pattern-order() = 1800 Provides: pattern-visible() Obsoletes: patterns-openSUSE-x11 < %{version} -Requires: pattern() = basesystem Requires: pattern() = enhanced_base Requires: pattern() = fonts Recommends: pattern() = x11_opt @@ -833,7 +829,6 @@ Provides: pattern-extends() = x11 Provides: pattern-icon() = yast-x11 Provides: pattern-order() = 1680 Obsoletes: patterns-openSUSE-x11_opt < %{version} -Requires: pattern() = basesystem Requires: pattern() = enhanced_base Requires: pattern() = fonts From 50f420ce6f1316f33fb8d0879a2bd3d720743f1779ac473ac719b7bdd12f3b84 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 16 Jun 2017 20:51:43 +0000 Subject: [PATCH 2/8] Accepting request 504291 from home:scarabeus_iv:branches:system:install:head - Drop xinetd from patterns as if someone really needs it they should rather pick it up. Today soultion for the problem is the systemd socket service. OBS-URL: https://build.opensuse.org/request/show/504291 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=25 --- patterns-base.changes | 7 +++++++ patterns-base.spec | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/patterns-base.changes b/patterns-base.changes index 7004254..36f5c1a 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 16 20:07:34 UTC 2017 - tchvatal@suse.com + +- Drop xinetd from patterns as if someone really needs it they should + rather pick it up. Today soultion for the problem is the systemd + socket service. + ------------------------------------------------------------------- Thu Jun 8 13:17:51 UTC 2017 - dimstar@opensuse.org diff --git a/patterns-base.spec b/patterns-base.spec index 736c3bd..a200261 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -400,7 +400,6 @@ Recommends: utempter Recommends: wireless-tools # Our editor of choice Recommends: vim -Recommends: xinetd Recommends: ntp Recommends: yp-tools Recommends: ypbind From 54c3c2b1a73c677020374ae29cb7127b4295c1c91d3805ea8747a5da212a119c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 3 Jul 2017 09:04:32 +0000 Subject: [PATCH 3/8] - No longer recommend sash: it's being removed from Tumbleweed. OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=26 --- patterns-base.changes | 5 + patterns-base.spec | 849 +++++++++++++++++++++--------------------- 2 files changed, 421 insertions(+), 433 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index 36f5c1a..0fd049c 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 3 09:04:14 UTC 2017 - dimstar@opensuse.org + +- No longer recommend sash: it's being removed from Tumbleweed. + ------------------------------------------------------------------- Fri Jun 16 20:07:34 UTC 2017 - tchvatal@suse.com diff --git a/patterns-base.spec b/patterns-base.spec index a200261..9dd4c50 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -17,7 +17,6 @@ %bcond_with betatest - Name: patterns-base Version: 20170319 Release: 0 @@ -26,8 +25,8 @@ License: MIT Group: Metapackages Url: https://github.com/openSUSE/patterns Source0: %{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: patterns-rpm-macros +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is an internal package that is used to create the patterns as part @@ -39,7 +38,6 @@ This particular package contains all the base / core patterns (and those that do ################################################################################ %package 32bit -%pattern_basetechnologies Summary: 32-Bit Runtime Environment Group: Metapackages Provides: patterns-openSUSE-32bit = %{version} @@ -47,18 +45,18 @@ 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 /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/32bit.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/32bit.txt ################################################################################ %package 64bit -%pattern_basetechnologies Summary: 64-Bit Runtime Environment Group: Metapackages Provides: patterns-openSUSE-64bit = %{version} @@ -67,97 +65,96 @@ Provides: pattern-icon() = yast-misc Provides: pattern-order() = 1160 Provides: pattern-visible() 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 /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/64bit.txt +%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() = 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} -Requires: pattern() = base -Recommends: pattern() = apparmor_opt - -Requires: apparmor-abstractions -Requires: apparmor-parser -Requires: apparmor-profiles -Requires: audit -Recommends: yast2-apparmor -Recommends: apparmor-utils -Suggests: pam_apparmor +%pattern_basetechnologies %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. %files apparmor -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/apparmor.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/apparmor.txt ################################################################################ %package apparmor_opt -%pattern_basetechnologies Summary: AppArmor Group: Metapackages +Requires: apparmor-docs +Requires: pattern() = 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} -Requires: pattern() = base - -Requires: apparmor-docs +%pattern_basetechnologies %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. %files apparmor_opt -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/apparmor_opt.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/apparmor_opt.txt ################################################################################ %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 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 -Recommends: ca-certificates-mozilla +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 -Recommends: spu-tools # #739878 - install pdisk by default Recommends: pdisk +Recommends: spu-tools %endif %if 0%{?is_opensuse} # get it branded @@ -179,201 +176,229 @@ Recommends: grub2-powerpc-ieee1275 %ifarch aarch64 Recommends: grub2-arm64-efi %endif -Suggests: systemd-logger %description base 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. %files base -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/base.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/base.txt ################################################################################ %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} -Requires: pattern() = enhanced_base -Recommends: pattern() = yast2_basis - -Requires: mc -Requires: openssh -Requires: w3m -Recommends: emacs-nox -Recommends: mtools -Recommends: susepaste -Recommends: susepaste-screenshot -Recommends: ntp -Recommends: vim -Recommends: screen -Recommends: tmux -Recommends: mosh -Recommends: rsync -Recommends: sensors -Recommends: libyui-ncurses-pkg -Recommends: libyui-ncurses -Recommends: command-not-found -Suggests: bsd-games -Suggests: grepmail -Suggests: irssi -Suggests: links -Suggests: nano -Suggests: ncftp -Suggests: minicom -Suggests: mlocate -Suggests: mutt -Suggests: slrn -Suggests: pinfo -Suggests: vlock -Suggests: alpine -Suggests: pico -Suggests: convert -Suggests: ding -Suggests: units -Suggests: gcal -Suggests: lftp -Suggests: dar -Suggests: par -Suggests: makedev -# #378747 -Suggests: cryptconfig -Suggests: cnetworkmanager +%pattern_basetechnologies %description console Applications useful for those using the console and no graphical desktop environment. %files console -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/console.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/console.txt ################################################################################ %package enhanced_base -%pattern_basetechnologies Summary: Enhanced Base System Group: Metapackages +Requires: pattern() = base +# firewall by default +Recommends: SuSEfirewall2 +Recommends: aaa_base-extras +# getfacl and setfacl +Recommends: acl +# #302569 +Recommends: alsa-plugins +# getattr and setattr +Recommends: attr +Recommends: autofs +Recommends: bind-utils +# compressor is interesting +Recommends: bzip2 +# #375103 +Recommends: cifs-utils +Recommends: command-not-found +# we rely on cron for daily/hourly +Recommends: cronie +Recommends: cryptsetup +# cups server for remote printing queues +Recommends: cups +# printing considered cool +Recommends: cups-client +Recommends: curl +Recommends: cyrus-sasl +Recommends: cyrus-sasl-crammd5 +Recommends: cyrus-sasl-digestmd5 +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: e2fsprogs +Recommends: ethtool +Recommends: file +Recommends: fillup +Recommends: findutils +Recommends: gawk +Recommends: genisoimage +Recommends: gettext-runtime +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 +# /bin/ip considered useful +Recommends: iproute2 +# ping is required for network tests +Recommends: iputils +Recommends: klogd +# #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 +Recommends: ncurses-utils +Recommends: netcat-openbsd +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 +# Bug 424707 - Feature "Command not found" for openSUSE by default +Recommends: scout +Recommends: sg3_utils +Recommends: smp_utils +# useful for debugging +Recommends: strace +Recommends: sudo +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} -Requires: pattern() = base -Recommends: pattern() = apparmor -Recommends: pattern() = yast2_basis -Recommends: pattern() = enhanced_base_opt -Recommends: pattern() = sw_management - -# having a ftp command line client is good for moving log files -Recommends: tnftp -# needed for detecting software raid - required by yast2-storage too -Recommends: mdadm -# #303857 -Recommends: kpartx -Recommends: dmraid -# man by default (#304687) -Recommends: man -# fuser (psmisc) by default (#304694) -Recommends: psmisc -# firewall by default -Recommends: SuSEfirewall2 -Recommends: aaa_base-extras -# getfacl and setfacl -Recommends: acl -# getattr and setattr -Recommends: attr -# compressor is interesting -Recommends: bzip2 -# printing considered cool -Recommends: cups-client -Recommends: curl -Recommends: cyrus-sasl-gssapi -Recommends: cyrus-sasl-crammd5 -Recommends: cyrus-sasl-digestmd5 -Recommends: cyrus-sasl-plain -# bnc#430895 -# cyrus-sasl-saslauthd -Recommends: db-utils -Recommends: diffutils -Recommends: ethtool -Recommends: e2fsprogs -Recommends: file -Recommends: fillup -Recommends: findutils -Recommends: hwinfo -Recommends: klogd -# /bin/ip considered useful -Recommends: iproute2 -# ping is required for network tests -Recommends: iputils -# pager -Recommends: less -Recommends: netcfg -Recommends: parted -Recommends: prctl -Recommends: mailx -Recommends: netcat-openbsd -Recommends: genisoimage -# we want a ssh server to be available -Recommends: openssh -Recommends: perl-base -# we rely on cron for daily/hourly -Recommends: cronie -Recommends: sysconfig -Recommends: systemd-sysvinit -Recommends: tar -Recommends: time -Recommends: wget -Recommends: wol -# split out of ncurses -Recommends: ncurses-utils -# we want a branded boot -Recommends: plymouth-branding-openSUSE -# we want a branded grub2 too #757683 -Recommends: grub2-branding-openSUSE -# #302569 -Recommends: alsa-plugins -# useful for debugging -Recommends: strace -Recommends: lsof -# mount NTFS rw -Recommends: ntfs-3g -# cups server for remote printing queues -Recommends: cups -# delta rpms are considered cool for updates -Recommends: deltarpm -Recommends: autofs -Recommends: bind-utils -# Make plymouth the new default bootsplash -Recommends: plymouth -Recommends: cyrus-sasl -Recommends: dosfstools -Recommends: gawk -Recommends: gettext-runtime -Recommends: glibc-locale -Recommends: gpart -Recommends: gpg2 -Recommends: gpm -Recommends: hdparm -Recommends: ifplugd -Recommends: info -Recommends: libatm1 -Recommends: master-boot-code -Recommends: syslinux -Recommends: nfs-client -Recommends: nfsidmap -Recommends: nscd -Recommends: ntfsprogs -Recommends: openldap2-client -Recommends: openslp -Recommends: pciutils +%pattern_basetechnologies %ifarch aarch64 %ix86 x86_64 Recommends: dmidecode %endif @@ -381,33 +406,14 @@ Recommends: dmidecode Recommends: acpica %endif %ifarch %ix86 x86_64 -Recommends: ucode-intel Recommends: ucode-amd +Recommends: ucode-intel %endif -Recommends: postfix -Recommends: tuned -Recommends: ppp -Recommends: pptp -Recommends: recode -Recommends: release-notes-openSUSE -Recommends: smp_utils -Recommends: sg3_utils -Recommends: lsscsi -Recommends: sudo -Recommends: timezone -Recommends: udev -Recommends: utempter -Recommends: wireless-tools -# Our editor of choice -Recommends: vim -Recommends: ntp -Recommends: yp-tools -Recommends: ypbind %ifarch ppc -Recommends: pdisk -Recommends: powerpc32 # #303737 Recommends: mouseemu +Recommends: pdisk +Recommends: powerpc32 %endif %ifarch x86_64 Recommends: glibc-32bit @@ -416,55 +422,28 @@ Recommends: glibc-locale-32bit %ifarch aarch64 x86_64 Recommends: numactl %endif -# #375103 -Recommends: cifs-utils -# lsusb is good for debugging USB devices - #401593 -Recommends: usbutils -Recommends: cryptsetup -# Bug 424707 - Feature "Command not found" for openSUSE by default -Recommends: scout -Recommends: command-not-found -Recommends: lsb-release -# autoconfig new printers - bnc#808014 -Recommends: udev-configure-printer -Suggests: reiserfs %description enhanced_base This is the enhanced base runtime system with lots of convenience packages. %files enhanced_base -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/enhanced_base.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/enhanced_base.txt ################################################################################ %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: OpenPrintingPPDs Recommends: dos2unix Recommends: ed Recommends: finger Recommends: groff Recommends: initviocons -%ifarch ppc -Recommends: hfsutils -%endif -# Current systems suffer from entropy starvation -%ifarch aarch64 %ix86 x86_64 ppc64 ppc64le -Recommends: haveged -%endif Recommends: irqbalance Recommends: joe Recommends: ksh @@ -472,22 +451,18 @@ Recommends: ksymoops Recommends: man-pages Recommends: man-pages-posix Recommends: manufacturer-PPDs -%ifarch x86_64 -Recommends: mcelog -%endif Recommends: mpt-status -Recommends: spax Recommends: perl-TermReadLine-Gnu Recommends: prctl Recommends: procinfo Recommends: procmail Recommends: providers Recommends: rsync -Recommends: sash Recommends: screen Recommends: setserial Recommends: sharutils Recommends: smartmontools +Recommends: spax Recommends: strace Recommends: tcpdump Recommends: tcsh @@ -499,62 +474,71 @@ Recommends: wol Recommends: zisofs-tools Recommends: zsh Suggests: acpid -Suggests: xz -Suggests: zip -Suggests: unzip +# DELL computers mainly #403270, but #441079 +Suggests: biosdevname Suggests: cpupower -Suggests: delayacct-utils -Suggests: hfsutils -Suggests: jfsutils -Suggests: ocfs2-tools -Suggests: xfsprogs -Suggests: lynx -Suggests: w3m-el -Suggests: pwgen -# delta apply -Suggests: xdelta # needed as soon as you want to do kerberos authentication Suggests: cyrus-sasl-gssapi -# tool for xfs -Suggests: xfsdump +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 -# DELL computers mainly #403270, but #441079 -Suggests: biosdevname -# bnc#388570 -Suggests: kerneloops +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 -Suggests: efibootmgr -# debugging boot - Was systemd-analyze -Suggests: systemd %description enhanced_base_opt This is the enhanced base runtime system with lots of convenience packages. %files enhanced_base_opt -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/enhanced_base_opt.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/enhanced_base_opt.txt ################################################################################ %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 -Obsoletes: patterns-openSUSE-minimal_base < %{version} -Recommends: pattern() = minimal_base_conflicts - Requires: aaa_base Requires: bash Requires: coreutils @@ -568,24 +552,11 @@ Requires: kmod Requires: pam Requires: procps Requires: rpm -%if 0%{?is_opensuse} -Requires: openSUSE-build-key -Requires: openSUSE-release -%else -Requires: sles-release -Recommends: suse-build-key -Recommends: SUSEConnect -%endif Requires: sysconfig Requires: system-group-hardware -Recommends: system-group-trusted -Recommends: system-group-wheel -Recommends: system-user-bin -Recommends: system-user-daemon Requires: system-user-nobody Requires: systemd Requires: zypper - Recommends: btrfsmaintenance Recommends: btrfsprogs Recommends: elfutils @@ -593,13 +564,31 @@ Recommends: grub2 Recommends: insserv Recommends: iproute2 Recommends: openssh +Recommends: pattern() = minimal_base_conflicts Recommends: rollback-helper Recommends: snapper +Recommends: system-group-trusted +Recommends: system-group-wheel +Recommends: system-user-bin +Recommends: system-user-daemon Recommends: sysvinit-tools Recommends: udev Suggests: ed - -%ifarch x86_64 %arm +Provides: patterns-openSUSE-minimal_base = %{version} +Provides: pattern() = minimal_base +Provides: pattern-icon() = yast-sw_single +Provides: pattern-order() = 5190 +Obsoletes: patterns-openSUSE-minimal_base < %{version} +%pattern_basetechnologies +%if 0%{?is_opensuse} +Requires: openSUSE-build-key +Requires: openSUSE-release +%else +Requires: sles-release +Recommends: SUSEConnect +Recommends: suse-build-key +%endif +%ifarch x86_64 %arm Recommends: efibootmgr %endif @@ -607,47 +596,24 @@ Recommends: efibootmgr This is the minimal openSUSE runtime system. It is really a minimal system, you can login and a shell will be started, that's all. It is intended as base for Appliances. %files minimal_base -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/minimal_base.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/minimal_base.txt ################################################################################ %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: smtp_daemon -Conflicts: perl-doc -Conflicts: readline-doc Conflicts: bash-doc -Conflicts: netpbm -# recommended by yast2-printer -Conflicts: samba-client +Conflicts: bundle-lang-gnome-extras-en Conflicts: cups-client -Conflicts: desktop-translations -# supplements into glib -Conflicts: gsettings-backend-dconf -Conflicts: glib-networking -Conflicts: vim-data # required by gio-branding Conflicts: desktop-data-openSUSE -# supplements yast2, not needed for ncurses only -Conflicts: yast2-branding -# supplements libgio and wget (TODO) -Conflicts: libproxy1-config-gnome3 -# requires python -Conflicts: zypper-log -# systemd recommends dbus-1-python -Conflicts: python -# python-base ~ 20MB -Conflicts: python-base +Conflicts: desktop-translations +Conflicts: glib-networking +# supplements into glib +Conflicts: gsettings-backend-dconf # perl ~ 40MB ## - we can't conflict with that as perl-Bootloader-YAML needs it #Conflicts: perl # binutils ~ 30MB @@ -664,65 +630,86 @@ Conflicts: gtk3-immodule-thai Conflicts: gtk3-immodule-tigrigna Conflicts: gtk3-immodule-vietnamese Conflicts: gvfs -Conflicts: bundle-lang-gnome-extras-en +# 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 %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. %files minimal_base_conflicts -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/minimal_base_conflicts.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/minimal_base_conflicts.txt ################################################################################ %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} -Recommends: pattern() = sw_management_x11 -# Zypper is the basic sw_management stack for *SUSE -Requires: zypper +%pattern_basetechnologies %if 0%{?sle_version} -Recommends: zypper-lifecycle-plugin Recommends: lifecycle-data +Recommends: zypper-lifecycle-plugin %endif %description sw_management This pattern provides a graphical application and a command line tool for keeping your system up to date. %files sw_management -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/sw_management.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/sw_management.txt ################################################################################ %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} - -Recommends: update-test-trival -Recommends: update-test-affects-package-manager -Recommends: update-test-security -Recommends: update-test-interactive -Recommends: update-test-optional -Recommends: update-test-reboot-needed +%pattern_basetechnologies %if %{with betatest} Recommends: aaa_base-malloccheck Supplements: %{name}-base @@ -732,129 +719,124 @@ Supplements: %{name}-base Packages used for testing that the update stack works. These tiny packages do not have any functionality themselves. %files update_test -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/update_test.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/update_test.txt ################################################################################ %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} -Requires: pattern() = enhanced_base -Requires: pattern() = fonts -Recommends: pattern() = x11_opt -Recommends: pattern() = x11_yast - -Recommends: xorg-x11-essentials -Recommends: xkeyboard-config -Recommends: xorg-x11-server +%pattern_graphicalenvironments %ifarch x86_64 Recommends: nss-mdns-32bit %endif -# needed e.g. for nvidia drivers -Recommends: x11-tools -Recommends: xterm -Recommends: ghostscript-x11 -Recommends: openssh-askpass -Recommends: tigervnc -Recommends: xorg-x11-driver-input -Recommends: xorg-x11-driver-video -Recommends: xorg-x11-libX11-ccache -# provides e.g. xdm -Recommends: xorg-x11-essentials -# people love having numlock configurable -Recommends: numlockx -# improve glxinfo output (#301647) -Recommends: freeglut -# #302566 -Recommends: x11-tools -# #353229 - drag in empty replacements -Recommends: translation-update # interesting for workstations too %ifarch %ix86 x86_64 Recommends: suspend %endif -# chooce icewm-default if you have a choice -# icewm-lite is too lightweight in new release -Recommends: icewm-default -Recommends: xauth -Recommends: command-not-found -Recommends: susepaste -Recommends: susepaste-screenshot -# required by others -Suggests: icewm -Suggests: wine -Suggests: fvwm2 -Suggests: fvwm-themes -Suggests: wpa_supplicant-gui -Suggests: hexchat -Suggests: gv -Suggests: gvim -Suggests: mmv -Suggests: pmidi -Suggests: xine-ui -Suggests: xosview -# on security probation -Suggests: xpdf-poppler -Suggests: xosd -# #394406 -Suggests: desktop-data-openSUSE-extra -Suggests: xorg-x11-driver-video-radeonhd -Suggests: xorg-x11-driver-video-unichrome %description x11 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. %files x11 -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/x11.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/x11.txt ################################################################################ %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} -Requires: pattern() = enhanced_base -Requires: pattern() = fonts - -Recommends: freeglut -Recommends: xdmbgrd -Recommends: xtermset -Suggests: tk -Suggests: unclutter -Suggests: xlockmore -Suggests: WindowMaker -Suggests: WindowMaker-applets -Suggests: WindowMaker-themes -Suggests: MozillaThunderbird -# #389816 -Suggests: xorg-x11-server-sdk +%pattern_graphicalenvironments %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. %files x11_opt -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/x11_opt.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/x11_opt.txt ################################################################################ %package x86 -%pattern_basetechnologies Summary: x86 Runtime Environment Group: Metapackages Provides: patterns-openSUSE-x86 = %{version} @@ -863,13 +845,14 @@ Provides: pattern-icon() = yast-misc Provides: pattern-order() = 1180 Provides: pattern-visible() Obsoletes: patterns-openSUSE-x86 < %{version} +%pattern_basetechnologies %description x86 This will install the 32-bit variant of all selected patterns. This allows to execute 32-bit software. %files x86 -%dir /usr/share/doc/packages/patterns -/usr/share/doc/packages/patterns/x86.txt +%dir %{_docdir}/patterns +%{_docdir}/patterns/x86.txt ################################################################################ @@ -878,12 +861,12 @@ This will install the 32-bit variant of all selected patterns. This allows to ex %build %install -mkdir -p %{buildroot}/usr/share/doc/packages/patterns +mkdir -p %{buildroot}%{_docdir}/patterns for i in 32bit 64bit apparmor apparmor_opt base 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}/usr/share/doc/packages/patterns/$i.txt" + >"%{buildroot}%{_docdir}/patterns/$i.txt" done %changelog From ab2330c9ee10b82fba6085018778b4c72374b929614b259ba1fefaad8c624e9b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 3 Jul 2017 09:05:22 +0000 Subject: [PATCH 4/8] multiple Provides: pattern() = FOO, as only one of them is seen OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=27 --- patterns-base.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patterns-base.changes b/patterns-base.changes index 0fd049c..f2b68f9 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -14,7 +14,7 @@ Fri Jun 16 20:07:34 UTC 2017 - tchvatal@suse.com Thu Jun 8 13:17:51 UTC 2017 - dimstar@opensuse.org - Cleanup patterns: a pattern definition is not allowed to have - multiple Provides: patter() = FOO, as only one of them is seen + multiple Provides: pattern() = FOO, as only one of them is seen by libsolv. ------------------------------------------------------------------- From 10582561e8216c3a8d2a63a0dd1a1801c0badece00cdde44a7581145a24f0baa Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 3 Jul 2017 09:08:28 +0000 Subject: [PATCH 5/8] cleanup OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=28 --- patterns-base.changes | 5 - patterns-base.spec | 851 +++++++++++++++++++++--------------------- 2 files changed, 434 insertions(+), 422 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index f2b68f9..f930449 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Jul 3 09:04:14 UTC 2017 - dimstar@opensuse.org - -- No longer recommend sash: it's being removed from Tumbleweed. - ------------------------------------------------------------------- Fri Jun 16 20:07:34 UTC 2017 - tchvatal@suse.com diff --git a/patterns-base.spec b/patterns-base.spec index 9dd4c50..a200261 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -17,6 +17,7 @@ %bcond_with betatest + Name: patterns-base Version: 20170319 Release: 0 @@ -25,8 +26,8 @@ License: MIT Group: Metapackages Url: https://github.com/openSUSE/patterns Source0: %{name}-rpmlintrc -BuildRequires: patterns-rpm-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: patterns-rpm-macros %description This is an internal package that is used to create the patterns as part @@ -38,6 +39,7 @@ This particular package contains all the base / core patterns (and those that do ################################################################################ %package 32bit +%pattern_basetechnologies Summary: 32-Bit Runtime Environment Group: Metapackages Provides: patterns-openSUSE-32bit = %{version} @@ -45,18 +47,18 @@ 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 +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/32bit.txt ################################################################################ %package 64bit +%pattern_basetechnologies Summary: 64-Bit Runtime Environment Group: Metapackages Provides: patterns-openSUSE-64bit = %{version} @@ -65,96 +67,97 @@ Provides: pattern-icon() = yast-misc Provides: pattern-order() = 1160 Provides: pattern-visible() 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 +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/64bit.txt ################################################################################ %package apparmor +%pattern_basetechnologies Summary: AppArmor Group: Metapackages -Requires: apparmor-abstractions -Requires: apparmor-parser -Requires: apparmor-profiles -Requires: audit -Requires: pattern() = 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() = base +Recommends: pattern() = apparmor_opt + +Requires: apparmor-abstractions +Requires: apparmor-parser +Requires: apparmor-profiles +Requires: audit +Recommends: yast2-apparmor +Recommends: apparmor-utils +Suggests: pam_apparmor %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. %files apparmor -%dir %{_docdir}/patterns -%{_docdir}/patterns/apparmor.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/apparmor.txt ################################################################################ %package apparmor_opt +%pattern_basetechnologies Summary: AppArmor Group: Metapackages -Requires: apparmor-docs -Requires: pattern() = 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() = 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. %files apparmor_opt -%dir %{_docdir}/patterns -%{_docdir}/patterns/apparmor_opt.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/apparmor_opt.txt ################################################################################ %package base +%pattern_basetechnologies Summary: Base System Group: Metapackages -Requires: kbd -Requires: openssh -Requires: pattern() = minimal_base -Requires: polkit -Requires: polkit-default-privs -Requires: rpm -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 +Requires: pattern() = minimal_base + +Requires: kbd +Requires: openssh +Requires: polkit +Requires: polkit-default-privs +Requires: rpm +Requires: shadow +Requires: util-linux +Requires: which +# Recommend NTP at least until boo#936378 is fixed and YaST is not trying to configure a service that's not there +Recommends: ntp +Recommends: ca-certificates-mozilla %ifarch ppc Recommends: libbspe +Recommends: spu-tools # #739878 - install pdisk by default Recommends: pdisk -Recommends: spu-tools %endif %if 0%{?is_opensuse} # get it branded @@ -176,229 +179,201 @@ Recommends: grub2-powerpc-ieee1275 %ifarch aarch64 Recommends: grub2-arm64-efi %endif +Suggests: systemd-logger %description base 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. %files base -%dir %{_docdir}/patterns -%{_docdir}/patterns/base.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/base.txt ################################################################################ %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 + +Requires: mc +Requires: openssh +Requires: w3m +Recommends: emacs-nox +Recommends: mtools +Recommends: susepaste +Recommends: susepaste-screenshot +Recommends: ntp +Recommends: vim +Recommends: screen +Recommends: tmux +Recommends: mosh +Recommends: rsync +Recommends: sensors +Recommends: libyui-ncurses-pkg +Recommends: libyui-ncurses +Recommends: command-not-found +Suggests: bsd-games +Suggests: grepmail +Suggests: irssi +Suggests: links +Suggests: nano +Suggests: ncftp +Suggests: minicom +Suggests: mlocate +Suggests: mutt +Suggests: slrn +Suggests: pinfo +Suggests: vlock +Suggests: alpine +Suggests: pico +Suggests: convert +Suggests: ding +Suggests: units +Suggests: gcal +Suggests: lftp +Suggests: dar +Suggests: par +Suggests: makedev +# #378747 +Suggests: cryptconfig +Suggests: cnetworkmanager %description console Applications useful for those using the console and no graphical desktop environment. %files console -%dir %{_docdir}/patterns -%{_docdir}/patterns/console.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/console.txt ################################################################################ %package enhanced_base +%pattern_basetechnologies Summary: Enhanced Base System Group: Metapackages -Requires: pattern() = base -# firewall by default -Recommends: SuSEfirewall2 -Recommends: aaa_base-extras -# getfacl and setfacl -Recommends: acl -# #302569 -Recommends: alsa-plugins -# getattr and setattr -Recommends: attr -Recommends: autofs -Recommends: bind-utils -# compressor is interesting -Recommends: bzip2 -# #375103 -Recommends: cifs-utils -Recommends: command-not-found -# we rely on cron for daily/hourly -Recommends: cronie -Recommends: cryptsetup -# cups server for remote printing queues -Recommends: cups -# printing considered cool -Recommends: cups-client -Recommends: curl -Recommends: cyrus-sasl -Recommends: cyrus-sasl-crammd5 -Recommends: cyrus-sasl-digestmd5 -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: e2fsprogs -Recommends: ethtool -Recommends: file -Recommends: fillup -Recommends: findutils -Recommends: gawk -Recommends: genisoimage -Recommends: gettext-runtime -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 -# /bin/ip considered useful -Recommends: iproute2 -# ping is required for network tests -Recommends: iputils -Recommends: klogd -# #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 -Recommends: ncurses-utils -Recommends: netcat-openbsd -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 -# Bug 424707 - Feature "Command not found" for openSUSE by default -Recommends: scout -Recommends: sg3_utils -Recommends: smp_utils -# useful for debugging -Recommends: strace -Recommends: sudo -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 +Requires: pattern() = base +Recommends: pattern() = apparmor +Recommends: pattern() = yast2_basis +Recommends: pattern() = enhanced_base_opt +Recommends: pattern() = sw_management + +# having a ftp command line client is good for moving log files +Recommends: tnftp +# needed for detecting software raid - required by yast2-storage too +Recommends: mdadm +# #303857 +Recommends: kpartx +Recommends: dmraid +# man by default (#304687) +Recommends: man +# fuser (psmisc) by default (#304694) +Recommends: psmisc +# firewall by default +Recommends: SuSEfirewall2 +Recommends: aaa_base-extras +# getfacl and setfacl +Recommends: acl +# getattr and setattr +Recommends: attr +# compressor is interesting +Recommends: bzip2 +# printing considered cool +Recommends: cups-client +Recommends: curl +Recommends: cyrus-sasl-gssapi +Recommends: cyrus-sasl-crammd5 +Recommends: cyrus-sasl-digestmd5 +Recommends: cyrus-sasl-plain +# bnc#430895 +# cyrus-sasl-saslauthd +Recommends: db-utils +Recommends: diffutils +Recommends: ethtool +Recommends: e2fsprogs +Recommends: file +Recommends: fillup +Recommends: findutils +Recommends: hwinfo +Recommends: klogd +# /bin/ip considered useful +Recommends: iproute2 +# ping is required for network tests +Recommends: iputils +# pager +Recommends: less +Recommends: netcfg +Recommends: parted +Recommends: prctl +Recommends: mailx +Recommends: netcat-openbsd +Recommends: genisoimage +# we want a ssh server to be available +Recommends: openssh +Recommends: perl-base +# we rely on cron for daily/hourly +Recommends: cronie +Recommends: sysconfig +Recommends: systemd-sysvinit +Recommends: tar +Recommends: time +Recommends: wget +Recommends: wol +# split out of ncurses +Recommends: ncurses-utils +# we want a branded boot +Recommends: plymouth-branding-openSUSE +# we want a branded grub2 too #757683 +Recommends: grub2-branding-openSUSE +# #302569 +Recommends: alsa-plugins +# useful for debugging +Recommends: strace +Recommends: lsof +# mount NTFS rw +Recommends: ntfs-3g +# cups server for remote printing queues +Recommends: cups +# delta rpms are considered cool for updates +Recommends: deltarpm +Recommends: autofs +Recommends: bind-utils +# Make plymouth the new default bootsplash +Recommends: plymouth +Recommends: cyrus-sasl +Recommends: dosfstools +Recommends: gawk +Recommends: gettext-runtime +Recommends: glibc-locale +Recommends: gpart +Recommends: gpg2 +Recommends: gpm +Recommends: hdparm +Recommends: ifplugd +Recommends: info +Recommends: libatm1 +Recommends: master-boot-code +Recommends: syslinux +Recommends: nfs-client +Recommends: nfsidmap +Recommends: nscd +Recommends: ntfsprogs +Recommends: openldap2-client +Recommends: openslp +Recommends: pciutils %ifarch aarch64 %ix86 x86_64 Recommends: dmidecode %endif @@ -406,14 +381,33 @@ Recommends: dmidecode Recommends: acpica %endif %ifarch %ix86 x86_64 -Recommends: ucode-amd Recommends: ucode-intel +Recommends: ucode-amd %endif +Recommends: postfix +Recommends: tuned +Recommends: ppp +Recommends: pptp +Recommends: recode +Recommends: release-notes-openSUSE +Recommends: smp_utils +Recommends: sg3_utils +Recommends: lsscsi +Recommends: sudo +Recommends: timezone +Recommends: udev +Recommends: utempter +Recommends: wireless-tools +# Our editor of choice +Recommends: vim +Recommends: ntp +Recommends: yp-tools +Recommends: ypbind %ifarch ppc -# #303737 -Recommends: mouseemu Recommends: pdisk Recommends: powerpc32 +# #303737 +Recommends: mouseemu %endif %ifarch x86_64 Recommends: glibc-32bit @@ -422,28 +416,55 @@ Recommends: glibc-locale-32bit %ifarch aarch64 x86_64 Recommends: numactl %endif +# #375103 +Recommends: cifs-utils +# lsusb is good for debugging USB devices - #401593 +Recommends: usbutils +Recommends: cryptsetup +# Bug 424707 - Feature "Command not found" for openSUSE by default +Recommends: scout +Recommends: command-not-found +Recommends: lsb-release +# autoconfig new printers - bnc#808014 +Recommends: udev-configure-printer +Suggests: reiserfs %description enhanced_base This is the enhanced base runtime system with lots of convenience packages. %files enhanced_base -%dir %{_docdir}/patterns -%{_docdir}/patterns/enhanced_base.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/enhanced_base.txt ################################################################################ %package enhanced_base_opt +%pattern_basetechnologies Summary: Enhanced Base System Group: Metapackages -Recommends: OpenPrintingPPDs +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: at Recommends: bc Recommends: cracklib-dict-full +Recommends: OpenPrintingPPDs Recommends: dos2unix Recommends: ed Recommends: finger Recommends: groff Recommends: initviocons +%ifarch ppc +Recommends: hfsutils +%endif +# Current systems suffer from entropy starvation +%ifarch aarch64 %ix86 x86_64 ppc64 ppc64le +Recommends: haveged +%endif Recommends: irqbalance Recommends: joe Recommends: ksh @@ -451,18 +472,22 @@ Recommends: ksymoops Recommends: man-pages Recommends: man-pages-posix Recommends: manufacturer-PPDs +%ifarch x86_64 +Recommends: mcelog +%endif Recommends: mpt-status +Recommends: spax Recommends: perl-TermReadLine-Gnu Recommends: prctl Recommends: procinfo Recommends: procmail Recommends: providers Recommends: rsync +Recommends: sash Recommends: screen Recommends: setserial Recommends: sharutils Recommends: smartmontools -Recommends: spax Recommends: strace Recommends: tcpdump Recommends: tcsh @@ -474,71 +499,62 @@ Recommends: wol Recommends: zisofs-tools Recommends: zsh Suggests: acpid -# DELL computers mainly #403270, but #441079 -Suggests: biosdevname +Suggests: xz +Suggests: zip +Suggests: unzip 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 +Suggests: xfsprogs +Suggests: lynx +Suggests: w3m-el +Suggests: pwgen +# delta apply +Suggests: xdelta +# needed as soon as you want to do kerberos authentication +Suggests: cyrus-sasl-gssapi +# tool for xfs +Suggests: xfsdump # #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 +# DELL computers mainly #403270, but #441079 +Suggests: biosdevname +# bnc#388570 +Suggests: kerneloops # #754959 %ifarch %ix86 x86_64 Suggests: hyper-v %endif +Suggests: efibootmgr +# debugging boot - Was systemd-analyze +Suggests: systemd %description enhanced_base_opt This is the enhanced base runtime system with lots of convenience packages. %files enhanced_base_opt -%dir %{_docdir}/patterns -%{_docdir}/patterns/enhanced_base_opt.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/enhanced_base_opt.txt ################################################################################ %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 +Obsoletes: patterns-openSUSE-minimal_base < %{version} +Recommends: pattern() = minimal_base_conflicts + Requires: aaa_base Requires: bash Requires: coreutils @@ -552,11 +568,24 @@ Requires: kmod Requires: pam Requires: procps Requires: rpm +%if 0%{?is_opensuse} +Requires: openSUSE-build-key +Requires: openSUSE-release +%else +Requires: sles-release +Recommends: suse-build-key +Recommends: SUSEConnect +%endif Requires: sysconfig Requires: system-group-hardware +Recommends: system-group-trusted +Recommends: system-group-wheel +Recommends: system-user-bin +Recommends: system-user-daemon Requires: system-user-nobody Requires: systemd Requires: zypper + Recommends: btrfsmaintenance Recommends: btrfsprogs Recommends: elfutils @@ -564,31 +593,13 @@ Recommends: grub2 Recommends: insserv Recommends: iproute2 Recommends: openssh -Recommends: pattern() = minimal_base_conflicts Recommends: rollback-helper Recommends: snapper -Recommends: system-group-trusted -Recommends: system-group-wheel -Recommends: system-user-bin -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 -Obsoletes: patterns-openSUSE-minimal_base < %{version} -%pattern_basetechnologies -%if 0%{?is_opensuse} -Requires: openSUSE-build-key -Requires: openSUSE-release -%else -Requires: sles-release -Recommends: SUSEConnect -Recommends: suse-build-key -%endif -%ifarch x86_64 %arm + +%ifarch x86_64 %arm Recommends: efibootmgr %endif @@ -596,24 +607,47 @@ Recommends: efibootmgr This is the minimal openSUSE runtime system. It is really a minimal system, you can login and a shell will be started, that's all. It is intended as base for Appliances. %files minimal_base -%dir %{_docdir}/patterns -%{_docdir}/patterns/minimal_base.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/minimal_base.txt ################################################################################ %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: smtp_daemon +Conflicts: perl-doc +Conflicts: readline-doc Conflicts: bash-doc -Conflicts: bundle-lang-gnome-extras-en +Conflicts: netpbm +# recommended by yast2-printer +Conflicts: samba-client 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: glib-networking +Conflicts: vim-data +# required by gio-branding +Conflicts: desktop-data-openSUSE +# supplements yast2, not needed for ncurses only +Conflicts: yast2-branding +# supplements libgio and wget (TODO) +Conflicts: libproxy1-config-gnome3 +# requires python +Conflicts: zypper-log +# systemd recommends dbus-1-python +Conflicts: python +# python-base ~ 20MB +Conflicts: python-base # perl ~ 40MB ## - we can't conflict with that as perl-Bootloader-YAML needs it #Conflicts: perl # binutils ~ 30MB @@ -630,86 +664,65 @@ 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 +Conflicts: bundle-lang-gnome-extras-en # 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 %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. %files minimal_base_conflicts -%dir %{_docdir}/patterns -%{_docdir}/patterns/minimal_base_conflicts.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/minimal_base_conflicts.txt ################################################################################ %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 +Recommends: lifecycle-data %endif %description sw_management This pattern provides a graphical application and a command line tool for keeping your system up to date. %files sw_management -%dir %{_docdir}/patterns -%{_docdir}/patterns/sw_management.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/sw_management.txt ################################################################################ %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-trival +Recommends: update-test-affects-package-manager +Recommends: update-test-security +Recommends: update-test-interactive +Recommends: update-test-optional +Recommends: update-test-reboot-needed %if %{with betatest} Recommends: aaa_base-malloccheck Supplements: %{name}-base @@ -719,124 +732,129 @@ Supplements: %{name}-base Packages used for testing that the update stack works. These tiny packages do not have any functionality themselves. %files update_test -%dir %{_docdir}/patterns -%{_docdir}/patterns/update_test.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/update_test.txt ################################################################################ %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 +Requires: pattern() = enhanced_base +Requires: pattern() = fonts +Recommends: pattern() = x11_opt +Recommends: pattern() = x11_yast + +Recommends: xorg-x11-essentials +Recommends: xkeyboard-config +Recommends: xorg-x11-server %ifarch x86_64 Recommends: nss-mdns-32bit %endif +# needed e.g. for nvidia drivers +Recommends: x11-tools +Recommends: xterm +Recommends: ghostscript-x11 +Recommends: openssh-askpass +Recommends: tigervnc +Recommends: xorg-x11-driver-input +Recommends: xorg-x11-driver-video +Recommends: xorg-x11-libX11-ccache +# provides e.g. xdm +Recommends: xorg-x11-essentials +# people love having numlock configurable +Recommends: numlockx +# improve glxinfo output (#301647) +Recommends: freeglut +# #302566 +Recommends: x11-tools +# #353229 - drag in empty replacements +Recommends: translation-update # interesting for workstations too %ifarch %ix86 x86_64 Recommends: suspend %endif +# chooce icewm-default if you have a choice +# icewm-lite is too lightweight in new release +Recommends: icewm-default +Recommends: xauth +Recommends: command-not-found +Recommends: susepaste +Recommends: susepaste-screenshot +# required by others +Suggests: icewm +Suggests: wine +Suggests: fvwm2 +Suggests: fvwm-themes +Suggests: wpa_supplicant-gui +Suggests: hexchat +Suggests: gv +Suggests: gvim +Suggests: mmv +Suggests: pmidi +Suggests: xine-ui +Suggests: xosview +# on security probation +Suggests: xpdf-poppler +Suggests: xosd +# #394406 +Suggests: desktop-data-openSUSE-extra +Suggests: xorg-x11-driver-video-radeonhd +Suggests: xorg-x11-driver-video-unichrome %description x11 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. %files x11 -%dir %{_docdir}/patterns -%{_docdir}/patterns/x11.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/x11.txt ################################################################################ %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 + +Recommends: freeglut +Recommends: xdmbgrd +Recommends: xtermset +Suggests: tk +Suggests: unclutter +Suggests: xlockmore +Suggests: WindowMaker +Suggests: WindowMaker-applets +Suggests: WindowMaker-themes +Suggests: MozillaThunderbird +# #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. %files x11_opt -%dir %{_docdir}/patterns -%{_docdir}/patterns/x11_opt.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/x11_opt.txt ################################################################################ %package x86 +%pattern_basetechnologies Summary: x86 Runtime Environment Group: Metapackages Provides: patterns-openSUSE-x86 = %{version} @@ -845,14 +863,13 @@ Provides: pattern-icon() = yast-misc Provides: pattern-order() = 1180 Provides: pattern-visible() Obsoletes: patterns-openSUSE-x86 < %{version} -%pattern_basetechnologies %description x86 This will install the 32-bit variant of all selected patterns. This allows to execute 32-bit software. %files x86 -%dir %{_docdir}/patterns -%{_docdir}/patterns/x86.txt +%dir /usr/share/doc/packages/patterns +/usr/share/doc/packages/patterns/x86.txt ################################################################################ @@ -861,12 +878,12 @@ This will install the 32-bit variant of all selected patterns. This allows to ex %build %install -mkdir -p %{buildroot}%{_docdir}/patterns +mkdir -p %{buildroot}/usr/share/doc/packages/patterns for i in 32bit 64bit apparmor apparmor_opt base 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" + >"%{buildroot}/usr/share/doc/packages/patterns/$i.txt" done %changelog From c1b9a998591d9aa543f3ab8c67bcb17c66f28a003dc3dfd8e2c39e0dfbc5259e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 3 Jul 2017 09:09:55 +0000 Subject: [PATCH 6/8] no more sash OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=29 --- patterns-base.changes | 5 +++++ patterns-base.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/patterns-base.changes b/patterns-base.changes index f930449..7c5e7be 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 3 09:09:31 UTC 2017 - dimstar@opensuse.org + +- Drop sash recommends: sash is being removed from Tumbleweed. + ------------------------------------------------------------------- Fri Jun 16 20:07:34 UTC 2017 - tchvatal@suse.com diff --git a/patterns-base.spec b/patterns-base.spec index a200261..7e1dca4 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -483,7 +483,6 @@ Recommends: procinfo Recommends: procmail Recommends: providers Recommends: rsync -Recommends: sash Recommends: screen Recommends: setserial Recommends: sharutils From 88eebd72c4a21a53f09c50ece37c3d4e39b1f37899f8e8762f50f44627d885d0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 3 Jul 2017 09:12:40 +0000 Subject: [PATCH 7/8] cleanup OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=30 --- patterns-base.changes | 7 ------- patterns-base.spec | 9 +++++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index 7c5e7be..c1e5b9f 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -10,13 +10,6 @@ Fri Jun 16 20:07:34 UTC 2017 - tchvatal@suse.com rather pick it up. Today soultion for the problem is the systemd socket service. -------------------------------------------------------------------- -Thu Jun 8 13:17:51 UTC 2017 - dimstar@opensuse.org - -- Cleanup patterns: a pattern definition is not allowed to have - multiple Provides: pattern() = FOO, as only one of them is seen - by libsolv. - ------------------------------------------------------------------- Thu Jun 8 09:49:25 UTC 2017 - dimstar@opensuse.org diff --git a/patterns-base.spec b/patterns-base.spec index 7e1dca4..2312572 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -87,7 +87,7 @@ Provides: pattern-icon() = pattern-apparmor Provides: pattern-order() = 1100 Provides: pattern-visible() Obsoletes: patterns-openSUSE-apparmor < %{version} -Requires: pattern() = base +Requires: pattern() = basesystem Recommends: pattern() = apparmor_opt Requires: apparmor-abstractions @@ -117,7 +117,7 @@ Provides: pattern-extends() = apparmor Provides: pattern-icon() = apparmor%2Fapp_armor.png Provides: pattern-order() = 1080 Obsoletes: patterns-openSUSE-apparmor_opt < %{version} -Requires: pattern() = base +Requires: pattern() = basesystem Requires: apparmor-docs @@ -136,6 +136,7 @@ Summary: Base System Group: Metapackages Provides: patterns-openSUSE-base = %{version} Provides: pattern() = base +Provides: pattern() = basesystem Provides: pattern-icon() = pattern-basis Provides: pattern-order() = 1020 Provides: pattern-visible() @@ -266,6 +267,7 @@ Provides: pattern-order() = 1060 Provides: pattern-visible() Obsoletes: patterns-openSUSE-enhanced_base < %{version} Requires: pattern() = base +Requires: pattern() = basesystem Recommends: pattern() = apparmor Recommends: pattern() = yast2_basis Recommends: pattern() = enhanced_base_opt @@ -548,6 +550,7 @@ This is the enhanced base runtime system with lots of convenience packages. Summary: Base System Group: Metapackages Provides: patterns-openSUSE-minimal_base = %{version} +Provides: pattern() = basesystem Provides: pattern() = minimal_base Provides: pattern-icon() = yast-sw_single Provides: pattern-order() = 5190 @@ -746,6 +749,7 @@ Provides: pattern-icon() = yast-x11 Provides: pattern-order() = 1800 Provides: pattern-visible() Obsoletes: patterns-openSUSE-x11 < %{version} +Requires: pattern() = basesystem Requires: pattern() = enhanced_base Requires: pattern() = fonts Recommends: pattern() = x11_opt @@ -827,6 +831,7 @@ Provides: pattern-extends() = x11 Provides: pattern-icon() = yast-x11 Provides: pattern-order() = 1680 Obsoletes: patterns-openSUSE-x11_opt < %{version} +Requires: pattern() = basesystem Requires: pattern() = enhanced_base Requires: pattern() = fonts From 941649748f7b20ae6ce948b87a09b3b0a071360115084b79c3cd2c5215cf39f0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 6 Jul 2017 08:43:20 +0000 Subject: [PATCH 8/8] - Make pattern minimal_base visible: there are quire some scripts relying on this to install containers. OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=31 --- patterns-base.changes | 6 ++++++ patterns-base.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/patterns-base.changes b/patterns-base.changes index c1e5b9f..6084e64 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 6 08:42:55 UTC 2017 - dimstar@opensuse.org + +- Make pattern minimal_base visible: there are quire some scripts + relying on this to install containers. + ------------------------------------------------------------------- Mon Jul 3 09:09:31 UTC 2017 - dimstar@opensuse.org diff --git a/patterns-base.spec b/patterns-base.spec index 2312572..65e2a37 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -554,6 +554,7 @@ Provides: pattern() = basesystem Provides: pattern() = minimal_base Provides: pattern-icon() = yast-sw_single Provides: pattern-order() = 5190 +Provides: pattern-visible() Obsoletes: patterns-openSUSE-minimal_base < %{version} Recommends: pattern() = minimal_base_conflicts