diff --git a/patterns-base.changes b/patterns-base.changes index 139a790..96cf9ce 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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 + boo#1049997). + ------------------------------------------------------------------- Thu Jul 13 10:52:42 UTC 2017 - dimstar@opensuse.org diff --git a/patterns-base.spec b/patterns-base.spec index 658f6af..049e371 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -17,7 +17,6 @@ %bcond_with betatest - Name: patterns-base Version: 20170319 Release: 0 @@ -26,7 +25,6 @@ License: MIT Group: Metapackages Url: https://github.com/openSUSE/patterns Source0: %{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: patterns-rpm-macros %description @@ -39,7 +37,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 +44,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} @@ -66,98 +63,113 @@ 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 /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() = 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} -Requires: pattern() = basesystem -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() = 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} -Requires: pattern() = basesystem - -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 basesystem +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. + +%files basesystem +%dir %{_docdir}/patterns +%{_docdir}/patterns/basesystem.txt ################################################################################ %package base -%pattern_basetechnologies 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() -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,202 +191,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 -Requires: pattern() = basesystem -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 @@ -382,86 +421,40 @@ 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 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 @@ -469,11 +462,7 @@ 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 @@ -484,6 +473,7 @@ Recommends: screen Recommends: setserial Recommends: sharutils Recommends: smartmontools +Recommends: spax Recommends: strace Recommends: tcpdump Recommends: tcsh @@ -495,64 +485,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() = 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 - Requires: aaa_base Requires: bash Requires: coreutils @@ -566,24 +563,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 @@ -591,13 +575,32 @@ 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 +Provides: pattern-visible() +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 @@ -605,47 +608,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 @@ -662,65 +642,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 @@ -730,128 +731,121 @@ 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() = basesystem -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 -# 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 +%pattern_graphicalenvironments # 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() = basesystem -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} @@ -860,6 +854,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 @@ -869,8 +864,8 @@ Recommends: glibc-locale-32bit 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 ################################################################################ @@ -879,12 +874,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 -for i in 32bit 64bit apparmor apparmor_opt base console enhanced_base \ +mkdir -p %{buildroot}%{_docdir}/patterns +for i in 32bit 64bit 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}/usr/share/doc/packages/patterns/$i.txt" + >"%{buildroot}%{_docdir}/patterns/$i.txt" done %changelog