Accepting request 639836 from home:simotek:branches:system:install:head

Merge in SLE patterns

OBS-URL: https://build.opensuse.org/request/show/639836
OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=72
This commit is contained in:
Simon Lees 2018-10-04 05:55:00 +00:00 committed by Git OBS Bridge
parent 7a72a089f5
commit ab8b1e1c1d
5 changed files with 1031 additions and 107 deletions

View File

@ -0,0 +1,173 @@
#!/usr/bin/perl
use strict;
use warnings;
my $verbose = 0;
my $pat_ext = "32bit";
my $product = "";
my @skip_pat = ();
sub get_file {
my $file_to_get = shift;
my $content = "";
open FILE, "<$file_to_get" or return "\n";
while (defined (my $line = <FILE>)) {
next if ($line =~ m/^#/);
$content .= $line;
}
close FILE;
return $content;
}
sub print_usage {
print "$0 [-v] [-h]\n";
exit 0;
}
sub print_debug {
my ($txt, $lvl) = @_;
print (STDERR "DBG: ${txt}\n") if($verbose >= $lvl);
}
sub parse_line {
my $to_parse = shift;
my $tmp = "";
if ($to_parse =~ /%include/) {
# TBD
print "%include at unexpected position, exiting\n";
exit (1);
}
if ($to_parse =~ /Summary:/) {
return "$to_parse\n";
}
# XXX simplify me
if ($to_parse =~ /Recommends:\s*([^\s]*)\s*/) {
$tmp = "$1";
return "" if ($tmp =~ m/.*-64bit\s*$/);
$tmp = "${tmp}-32bit" if($tmp !~ m/.*-32bit/);
return "Recommends: ${tmp}\n";
}
if ($to_parse =~ /Requires:\s*([^\s]*)\s*/) {
$tmp = "$1";
return "" if ($tmp =~ m/pattern()/);
return "" if ($tmp =~ m/.*-64bit\s*$/);
$tmp = "${tmp}-32bit" if($tmp !~ m/.*-32bit/);
return "Recommends: ${tmp}\n";
}
return "";
}
sub parse_main_file {
my $main_file = shift;
my $spec_file = "";
my $cur_pattern = "";
my $skip_it = 1;
my %skip_pat_hash;
if(! open (MAIN_FILE, "<$main_file")) {
print STDERR "${main_file} not found, exiting\n";
exit 1;
}
while (defined (my $line = <MAIN_FILE>)) {
chomp($line);
next if ($line =~ m/^#/);
if ($line =~ m/\%package/) {
if(($line =~ m/32bit/) or
($line =~ m/64bit/)
) {
$skip_it = 1;
} else {
%skip_pat_hash = map { $_ => 1 } @skip_pat;
if($skip_it==0&&!exists($skip_pat_hash{$cur_pattern})) {
$spec_file .= ""
."Provides: pattern() = ${cur_pattern}%2d32bit\n"
."Group: Metapackages\n"
."Supplements: packageand(patterns-${product}-${pat_ext}:patterns-${product}-${cur_pattern})\n"
."\n"
."%files ${cur_pattern}-32bit\n"
."%defattr(-,root,root)\n"
."%dir /usr/share/doc/packages/patterns\n"
."/usr/share/doc/packages/patterns/${cur_pattern}-${pat_ext}.txt\n"
."\n"
."%description ${cur_pattern}-${pat_ext}\n"
."The ${pat_ext} pattern complementing ${cur_pattern}.\n"
."#\n"
."#-------------------------------------------------------------------\n"
."#\n";
}
$skip_it = 0 ;
$line =~ m/package\s*([^\s]*)\s*/;
$cur_pattern = $1;
if (!exists($skip_pat_hash{$cur_pattern})) {
$spec_file .= "%package ${cur_pattern}-32bit\n";
}
}
}
next if($skip_it == 1 );
if ($line =~ /%include/) {
my $file_to_check = ($line =~ m/%include.*?([^\/\s]*)$/)[0]; # beware the non-greedy '?'
next if($file_to_check =~ m/32bit/);
if( open TMP_FILE, "<$file_to_check") {
print_debug(" Checking INCLUDE: $file_to_check", 2);
while (defined (my $include_line = <TMP_FILE>)) {
if (!exists($skip_pat_hash{$cur_pattern})) {
$spec_file .= parse_line($include_line);
}
}
close TMP_FILE;
}
next;
}
if (!exists($skip_pat_hash{$cur_pattern})) {
$spec_file .= parse_line($line);
}
}
%skip_pat_hash = map { $_ => 1 } @skip_pat;
if (!exists($skip_pat_hash{$cur_pattern})) {
# I hate this, but need a fast workaround
$spec_file .= "Provides: pattern-invisible()\n"
."Provides: pattern() = ${cur_pattern}%2d${pat_ext}\n"
."Group: Metapackages\n"
."Supplements: packageand(patterns-${product}-${pat_ext}:patterns-${product}-${cur_pattern})\n"
."\n"
."%files ${cur_pattern}-32bit\n"
."%defattr(-,root,root)\n"
."%dir /usr/share/doc/packages/patterns\n"
."/usr/share/doc/packages/patterns/${cur_pattern}-${pat_ext}.txt\n"
."\n"
."%description ${cur_pattern}-${pat_ext}\n"
."The ${pat_ext} pattern complementing ${cur_pattern}.\n"
."\n";
}
close MAIN_FILE;
my $new_file = $spec_file;
return $new_file;
}
while ($ARGV[0] && $ARGV[0] =~ /^-/) {
my $arg = shift;
if ($arg =~ /-v/) {
$verbose += 1;
} elsif($arg =~ /-h/) {
print_usage();
exit();
} elsif($arg =~ /-p/) {
$product=shift;
} elsif($arg =~ /-e/) {
$pat_ext=shift;
} elsif($arg =~ /-s/) {
push @skip_pat, shift;
}
}
print_debug("product = ${product}\n pat_ext=${pat_ext}\n", 1);
my $result = parse_main_file("patterns-${product}.spec");
print "${result}\n";
exit 0;

View File

@ -0,0 +1,403 @@
%package apparmor-32bit
Summary: AppArmor
Recommends: pattern()-32bit
Recommends: apparmor-abstractions-32bit
Recommends: apparmor-parser-32bit
Recommends: apparmor-profiles-32bit
Recommends: apparmor-docs-32bit
Recommends: apparmor-utils-32bit
Recommends: yast2-apparmor-32bit
Recommends: audit-32bit
Recommends: audit-32bit
Provides: pattern() = apparmor%2d32bit
Group: Metapackages
Supplements: packageand(patterns-base-32bit:patterns-base-apparmor)
%files apparmor-32bit
%defattr(-,root,root)
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/apparmor-32bit.txt
%description apparmor-32bit
The 32bit pattern complementing apparmor.
#
#-------------------------------------------------------------------
#
%package base-32bit
Summary: Base System
Recommends: kbd-32bit
Recommends: openssh-32bit
Recommends: polkit-32bit
Recommends: polkit-default-privs-32bit
Recommends: rpm-32bit
Recommends: shadow-32bit
Recommends: util-linux-32bit
Recommends: which-32bit
Recommends: bash-completion-32bit
Recommends: busybox-static-32bit
Recommends: ca-certificates-mozilla-32bit
Recommends: chrony-32bit
Recommends: cron-32bit
Recommends: cronie-32bit
Recommends: grub2-32bit
Recommends: systemd-sysvinit-32bit
Recommends: branding-openSUSE-32bit
Recommends: branding-SLE-32bit
Recommends: shim-32bit
Recommends: lshw-32bit
Recommends: lsvpd-32bit
Recommends: ppc64-diag-32bit
Provides: pattern() = base%2d32bit
Group: Metapackages
Supplements: packageand(patterns-base-32bit:patterns-base-base)
%files base-32bit
%defattr(-,root,root)
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/base-32bit.txt
%description base-32bit
The 32bit pattern complementing base.
#
#-------------------------------------------------------------------
#
%package enhanced_base-32bit
Summary: Enhanced Base System
Recommends: pattern()-32bit
Recommends: pattern()-32bit
Recommends: pattern()-32bit
Recommends: pattern()-32bit
Recommends: firewalld-32bit
Recommends: aaa_base-extras-32bit
Recommends: acl-32bit
Recommends: alsa-plugins-32bit
Recommends: attr-32bit
Recommends: autofs-32bit
Recommends: bind-utils-32bit
Recommends: binutils-32bit
Recommends: bzip2-32bit
Recommends: cifs-utils-32bit
Recommends: command-not-found-32bit
Recommends: cpio-32bit
Recommends: cronie-32bit
Recommends: cpupower-32bit
Recommends: cryptsetup-32bit
Recommends: cups-32bit
Recommends: cups-client-32bit
Recommends: curl-32bit
Recommends: cyrus-sasl-32bit
Recommends: cyrus-sasl-crammd5-32bit
Recommends: cyrus-sasl-digestmd5-32bit
Recommends: cyrus-sasl-gssapi-32bit
Recommends: cyrus-sasl-plain-32bit
Recommends: deltarpm-32bit
Recommends: diffutils-32bit
Recommends: dos2unix-32bit
Recommends: e2fsprogs-32bit
Recommends: file-32bit
Recommends: fillup-32bit
Recommends: findutils-32bit
Recommends: fuse-32bit
Recommends: gawk-32bit
Recommends: genisoimage-32bit
Recommends: gettext-runtime-32bit
Recommends: glibc-locale-32bit
Recommends: gpart-32bit
Recommends: gpg2-32bit
Recommends: gpm-32bit
Recommends: grep-32bit
Recommends: gzip-32bit
Recommends: hdparm-32bit
Recommends: hwinfo-32bit
Recommends: info-32bit
Recommends: initviocons-32bit
Recommends: iproute2-32bit
Recommends: iputils-32bit
Recommends: irqbalance-32bit
Recommends: joe-32bit
Recommends: kmod-compat-32bit
Recommends: kpartx-32bit
Recommends: krb5-32bit
Recommends: less-32bit
Recommends: lsscsi-32bit
Recommends: logrotate-32bit
Recommends: mailx-32bit
Recommends: man-32bit
Recommends: mdadm-32bit
Recommends: multipath-tools-32bit
Recommends: ncurses-utils-32bit
Recommends: net-tools-32bit
Recommends: netcat-openbsd-32bit
Recommends: netcfg-32bit
Recommends: net-snmp-32bit
Recommends: nfs-client-32bit
Recommends: nfsidmap-32bit
Recommends: nscd-32bit
Recommends: openslp-32bit
Recommends: openssh-32bit
Recommends: pam-config-32bit
Recommends: parted-32bit
Recommends: pciutils-32bit
Recommends: pciutils-ids-32bit
Recommends: pcre-32bit
Recommends: perl-Bootloader-32bit
Recommends: perl-base-32bit
Recommends: pinentry-32bit
Recommends: popt-32bit
Recommends: postfix-32bit
Recommends: rsyslog-32bit
Recommends: rsync-32bit
Recommends: scout-32bit
Recommends: screen-32bit
Recommends: sed-32bit
Recommends: sg3_utils-32bit
Recommends: smartmontools-32bit
Recommends: sysconfig-32bit
Recommends: systemd-sysvinit-32bit
Recommends: time-32bit
Recommends: timezone-32bit
Recommends: translation-update-32bit
Recommends: udev-32bit
Recommends: udev-configure-printer-32bit
Recommends: usbutils-32bit
Recommends: vim-32bit
Recommends: wget-32bit
Recommends: xz-32bit
Recommends: zisofs-tools-32bit
Recommends: dmidecode-32bit
Recommends: haveged-32bit
Recommends: hfsutils-32bit
Recommends: mouseemu-32bit
Recommends: pdisk-32bit
Recommends: powerpc32-32bit
Recommends: grub2-branding-openSUSE-32bit
Recommends: plymouth-32bit
Recommends: plymouth-branding-openSUSE-32bit
Recommends: release-notes-openSUSE-32bit
Recommends: plymouth-32bit
Recommends: grub2-branding-SLE-32bit
Recommends: OpenIPMI-32bit
Recommends: bash-completion-32bit
Recommends: cpp-32bit
Recommends: cryptconfig-32bit
Recommends: expect-32bit
Recommends: ipmitool-32bit
Recommends: lvm2-32bit
Recommends: m4-32bit
Recommends: make-32bit
Recommends: mksh-32bit
Recommends: mutt-32bit
Recommends: quota-32bit
Recommends: supportutils-32bit
Recommends: sysfsutils-32bit
Recommends: tcsh-32bit
Recommends: w3m-32bit
Recommends: lsof-32bit
Recommends: psmisc-32bit
Recommends: sudo-32bit
Recommends: ethtool-32bit
Recommends: ntfs-3g-32bit
Recommends: ntfsprogs-32bit
Recommends: dmraid-32bit
Recommends: dosfstools-32bit
Recommends: ifplugd-32bit
Recommends: klogd-32bit
Recommends: nano-32bit
Recommends: openldap2-client-32bit
Recommends: prctl-32bit
Recommends: recode-32bit
Recommends: smp_utils-32bit
Recommends: strace-32bit
Recommends: syslinux-32bit
Recommends: tnftp-32bit
Recommends: tuned-32bit
Recommends: wireless-tools-32bit
Recommends: wol-32bit
Recommends: acpica-32bit
Recommends: mcelog-32bit
Recommends: numactl-32bit
Recommends: ucode-amd-32bit
Recommends: ucode-intel-32bit
Provides: pattern() = enhanced_base%2d32bit
Group: Metapackages
Supplements: packageand(patterns-base-32bit:patterns-base-enhanced_base)
%files enhanced_base-32bit
%defattr(-,root,root)
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/enhanced_base-32bit.txt
%description enhanced_base-32bit
The 32bit pattern complementing enhanced_base.
#
#-------------------------------------------------------------------
#
%package minimal_base-32bit
Summary: Base System
Recommends: pattern()-32bit
Recommends: aaa_base-32bit
Recommends: bash-32bit
Recommends: coreutils-32bit
Recommends: device-mapper-32bit
Recommends: distribution-release-32bit
Recommends: dracut-32bit
Recommends: e2fsprogs-32bit
Recommends: filesystem-32bit
Recommends: glibc-32bit
Recommends: kbd-32bit
Recommends: kmod-32bit
Recommends: pam-32bit
Recommends: procps-32bit
Recommends: rpm-32bit
Recommends: sysconfig-32bit
Recommends: system-group-hardware-32bit
Recommends: system-user-nobody-32bit
Recommends: systemd-32bit
Recommends: zypper-32bit
Recommends: btrfsmaintenance-32bit
Recommends: btrfsprogs-32bit
Recommends: elfutils-32bit
Recommends: glibc-locale-32bit
Recommends: grub2-32bit
Recommends: iproute2-32bit
Recommends: openssh-32bit
Recommends: snapper-32bit
Recommends: system-group-trusted-32bit
Recommends: system-group-wheel-32bit
Recommends: system-user-bin-32bit
Recommends: system-user-daemon-32bit
Recommends: systemd-coredump-32bit
Recommends: sysvinit-tools-32bit
Recommends: udev-32bit
Recommends: rollback-helper-32bit
Recommends: openSUSE-build-key-32bit
Recommends: rollback_helper-32bit
Recommends: SUSEConnect-32bit
Recommends: suse-build-key-32bit
Recommends: efibootmgr-32bit
Provides: pattern() = minimal_base%2d32bit
Group: Metapackages
Supplements: packageand(patterns-base-32bit:patterns-base-minimal_base)
%files minimal_base-32bit
%defattr(-,root,root)
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/minimal_base-32bit.txt
%description minimal_base-32bit
The 32bit pattern complementing minimal_base.
#
#-------------------------------------------------------------------
#
%package sw_management-32bit
Summary: Software Management
Recommends: pattern()-32bit
Recommends: zypper-32bit
Recommends: lifecycle-data-32bit
Recommends: zypper-lifecycle-plugin-32bit
Provides: pattern() = sw_management%2d32bit
Group: Metapackages
Supplements: packageand(patterns-base-32bit:patterns-base-sw_management)
%files sw_management-32bit
%defattr(-,root,root)
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/sw_management-32bit.txt
%description sw_management-32bit
The 32bit pattern complementing sw_management.
#
#-------------------------------------------------------------------
#
%package x11-32bit
Summary: X Window System
Recommends: pattern()-32bit
Recommends: pattern()-32bit
Recommends: xorg-x11-fonts-core-32bit
Recommends: xorg-x11-server-32bit
Recommends: xf86-input-libinput-32bit
Recommends: xf86-input-vmmouse-32bit
Recommends: xf86-input-wacom-32bit
Recommends: xorg-x11-32bit
Recommends: x11-tools-32bit
Recommends: xorg-x11-driver-video-32bit
Recommends: xorg-x11-essentials-32bit
Recommends: xorg-x11-server-extra-32bit
Recommends: xorg-x11-fonts-32bit
Recommends: yast2-qt-32bit
Recommends: dejavu-fonts-32bit
Recommends: google-roboto-fonts-32bit
Recommends: icewm-theme-branding-32bit
Recommends: icewm-default-32bit
Recommends: lightdm-32bit
Recommends: openssh-askpass-gnome-32bit
Recommends: noto-sans-fonts-32bit
Recommends: tigervnc-32bit
Recommends: xdmbgrd-32bit
Recommends: xorg-x11-Xvnc-32bit
Recommends: xtermset-32bit
Recommends: xterm-32bit
Recommends: libyui-qt-32bit
Recommends: libyui-qt-pkg-32bit
Recommends: yast2-control-center-32bit
Provides: pattern() = x11%2d32bit
Group: Metapackages
Supplements: packageand(patterns-base-32bit:patterns-base-x11)
%files x11-32bit
%defattr(-,root,root)
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/x11-32bit.txt
%description x11-32bit
The 32bit pattern complementing x11.
#
#-------------------------------------------------------------------
#
%package x11_enhanced-32bit
Summary: X Window System
Recommends: pattern()-32bit
Recommends: pattern()-32bit
Recommends: glibc-locale-32bit
Recommends: xkeyboard-config-32bit
Recommends: MozillaFirefox-32bit
Recommends: MozillaFirefox-translations-32bit
Recommends: cabextract-32bit
Recommends: command-not-found-32bit
Recommends: dialog-32bit
Recommends: dbus-1-glib-32bit
Recommends: dbus-1-x11-32bit
Recommends: fontconfig-32bit
Recommends: fonts-config-32bit
Recommends: fribidi-32bit
Recommends: ghostscript-x11-32bit
Recommends: numlockx-32bit
Recommends: translation-update-32bit
Recommends: xauth-32bit
Recommends: xdmbgrd-32bit
Recommends: xkeyboard-config-32bit
Recommends: xorg-x11-fonts-32bit
Recommends: xorg-x11-fonts-core-32bit
Recommends: yast2-control-center-gnome-32bit
Recommends: yast2-scanner-32bit
Recommends: MozillaFirefox-branding-SLE-32bit
Recommends: desktop-data-SLE-32bit
Recommends: numlockx-32bit
Recommends: openssh-askpass-32bit
Recommends: susepaste-32bit
Recommends: susepaste-screenshot-32bit
Provides: pattern() = x11_enhanced%2d32bit
Group: Metapackages
Supplements: packageand(patterns-base-32bit:patterns-base-x11_enhanced)
%files x11_enhanced-32bit
%defattr(-,root,root)
%dir /usr/share/doc/packages/patterns
/usr/share/doc/packages/patterns/x11_enhanced-32bit.txt
%description x11_enhanced-32bit
The 32bit pattern complementing x11_enhanced.
#
#-------------------------------------------------------------------
#

View File

@ -1,3 +1,133 @@
-------------------------------------------------------------------
Wed Oct 3 13:31:30 UTC 2018 - sflees@suse.de
- nfs-doc is now installed with supplements
- remove the list of openSUSE only packages that was rejected for
inclusion in SLE.
- Add bug numbers for TODO's
-------------------------------------------------------------------
Wed Oct 3 11:56:16 CEST 2018 - sflees@suse.de
- Merge back in Leap 15 / SLE changes, important items from that
packages changlog can be found below
lnussel@suse.de
- explicitly include rsyslog in the base pattern to make sure
logging goes to /var/log/messages as documented (bsc#1094841).
- require distribution-release instead of openSUSE-release to avoid conflicts
when migrating to SLE (boo#1089031)
- do not recommend ntp also in enhanced_base (boo#162331)
- make everything in enhanced_base_opt really optional. It just
increases the server install and SLE doesn't have the pattern at
all either (bsc#1090189)
- move ordering of patterns-base-base after gnome_x11 (bsc#1091102)
- Don't generate 32bit patterns for readonly_root_tools
- Add create_32bit-patterns_file.pl as source
- guard some sle specifics with %is_opensuse
sflees@suse.de
- Rework x11 pattern bsc#1086663
- Recommend terminfo in minimal_base bsc#1081747
- rpm doesn't need to be in base and minimal_base_conflicts
- dont create transactional_base-32bit pattern.
- Remove grub variants from patterns bsc#1064265
- Don't install rollback helper on openSUSE (See why is this even
in here.... thread on openSUSE project mailing list) boo#1086584
- add lightdm as a recommends to x11 pattern boo#1081760
- fix pattern names packgeand() lines of 32bit patterns (bsc#1079353)
- put chrony in base system (bsc#1072351)
- fix pattern() provides to use %2d instead of dash to avoid rpm
parsing the string as name-version (bsc#1079353)
- don't recommend insserv-compat as anything sysvinit is obsolete
- Add lshw
- lsvpd is only relevant on ppc systems
- Provide chrony in base patterns (bsc#1072351, fate#323432)
- Install pp64-diag and lsvpd by default (bsc#1072351)
- Add obsoletes across all patterns (bsc#1071761)
- minimal_base doesn't need to be visable in yast
- Basesystem and Documentation don't need 32bit patterns
- base pattern now obsoletes and provides Minimal to make
SLES-12 upgrades smoother (bsc#1062164)
- x11_enhanced pattern now obsoletes and provides Minimal to make
SLED-12 upgrades smoother (bsc#1062164)
- Source pattern-definition-32bit.txt correctly
- Bring back in other patterns, from sle
* console
* enhanced_base
* enhanced_base_opt
* sw_management
- Update enhanced_base and x11_enhanced based off SLES minimal and x11_enhanced
patterns
- Split the following patterns into patterns-enhanced-base
* console
* enhanced_base
* enhanced_base_opt
* sw_management
- Remove minimal_base_conflicts (not in SLE we can probably live without)
- Major changes to X11 package, to line up with SLES, new package will be
added in patterns-enhanced-base to keep openSUSE/SLED compaitible
- Add documentation from SLE
- Copy 32bit support from SLE (x86 package removed)
- slight change to apparmor packages to match sle
- recommend salt-minion only on SLE
- Remove ppc only requires from base
fcrozat@suse.com
- Do not recommends on SLE patterns which aren't shipped on SLE.
- Ensure recommends on ntfs-3g and ntfsprogs are enabled on SLE
(bsc#1087242).
- Ensure xorg-x11-driver-input is required for x11 pattern, except
on s390/390x where it doesn't exist.
- Recommends plymouth on SLE (bsc#1067481).
- Ensure openSUSE patterns aren't provided / obsoletes when
building for SLE.
- Add Recommend to enhanced_base: OpenIPMI bash-completion cpp
cryptconfig expect ipmitool lvm2 m4 make mksh mutt quota
supportutils sysfsutils tcsh w3m lsof psmisc sudo.
- Add grub2-branding-SLE recommends on enhanced_base on SLE.
- Fix description of minimal_base on SLE.
behlert@suse.de
- drop patterns-base-32bit pattern for s390 and s390x [bsc#1088669]
- added timezone as recommended to minimal_base pattern
[bsc#1085075]
- ethtool is available on SLE 15, moving out of "opensuse only"
section [bsc#1087354]
okurz@suse.com
- put cron in base system (bsc#1072602)
fvogt@suse.com
- Don't require apparmor-docs, only recommend it
- Require xorg-x11-fonts-core instead of xorg-x11-fonts
- Don't require xorg-x11, only recommend it
kukuk@suse.de
- Remove salt-minion from base [bsc#1064266]
- Move tar to minimal pattern, too many low level tools assume
tar is installed by default
- Rename xterm-bin back to xterm, we still have xterm.rpm
- Remove libnss_compat2 (dropped, still part of glibc) and
libnss_nis2 (needs to be together with ypbind)
- Remove again added pam-modules, this package deprecated since
many years.
coolo@suse.com
- Recommend glibc-locale from minimal_base not enhanced_base,
we install in en_US, so we need a locale one way or the other.
Requiring it from enhanced_base now to make sure it's part of
regular installations (but can be disabled for e.g. chroots
with C locale - bsc#1057377)
- Do not provide x11 in x11_enhanced but require it
- Move basic X11 apps to x11 pattern and Firefox to x11_enhanced
- Remove tcl and tk from default installation
fbui@suse.com
- Don't install systemd-coredump by default on Leap (bsc#1083849)
- Add systemd-coredump to the list of recommended packages of miminal_base
Latest systemd package splitted off its coredump management facility
into a sub-package. Recommend this package so this functionnality is
still available by default on SLE (but will be disabled on Leap, see
bsc#1083849).
Also give the possibility to block it by using a soft dep
(Recommends:). This might be needed on live images for example where
space is rather low.
-------------------------------------------------------------------
Thu Sep 27 05:26:44 UTC 2018 - antoine.belvire@opensuse.org
@ -32,7 +162,7 @@ Thu Jul 26 14:46:15 UTC 2018 - rbrown@suse.com
-------------------------------------------------------------------
Wed Jul 18 14:30:55 UTC 2018 - rbrown@suse.com
- Make transactional_base pattern available for SLE (fate#326327)
- Make transactional_base pattern available for SLE (fate#326327)
-------------------------------------------------------------------
Tue Jun 5 11:59:37 UTC 2018 - dimstar@opensuse.org
@ -5329,4 +5459,3 @@ Wed Jul 12 13:08:48 CEST 2006 - aj@suse.de
- Initial Pattern for openSUSE. This is just a really basic list
to get us started and test that everything works.

View File

@ -18,13 +18,15 @@
%bcond_with betatest
Name: patterns-base
Version: 20170410
Version: 20180616
Release: 0
Summary: Patterns for Installation (base patterns)
License: MIT
Group: Metapackages
Url: https://github.com/openSUSE/patterns
Source0: %{name}-rpmlintrc
Source1: pattern-definition-32bit.txt
Source2: create_32bit-patterns_file.pl
BuildRequires: patterns-rpm-macros
%description
@ -36,16 +38,55 @@ This particular package contains all the base / core patterns (and those that do
################################################################################
# bsc#1088669 - only provide 32bit pattern for 64bit intel
%ifarch x86_64
%package 32bit
%pattern_basetechnologies
Summary: 32-Bit Runtime Environment
Group: Metapackages
Provides: pattern() = 32bit
Provides: pattern-icon() = yast-misc
Provides: pattern-order() = 1180
Provides: pattern-visible()
%if 0%{?is_opensuse}
Provides: patterns-openSUSE-32bit = %{version}
Provides: patterns-openSUSE-x86 = %{version}
Obsoletes: patterns-openSUSE-32bit < %{version}
Obsoletes: patterns-openSUSE-x86 < %{version}
%else
Provides: patterns-sled-32bit = %{version}
Provides: patterns-sles-32bit = %{version}
Obsoletes: patterns-sled-32bit < %{version}
Obsoletes: patterns-sles-32bit < %{version}
%endif
%description 32bit
This will install the 32-bit variant of all selected patterns. This allows to execute 32-bit software.
%files 32bit
%dir %{_docdir}/patterns
%{_docdir}/patterns/32bit.txt
%endif
################################################################################
%package apparmor
%pattern_basetechnologies
Summary: AppArmor
Group: Metapackages
Provides: patterns-openSUSE-apparmor = %{version}
Provides: pattern() = apparmor
Provides: pattern-icon() = pattern-apparmor
Provides: pattern-order() = 1100
Provides: pattern-visible()
%if 0%{?is_opensuse}
Provides: patterns-openSUSE-apparmor = %{version}
Obsoletes: patterns-openSUSE-apparmor < %{version}
%else
Provides: patterns-sled-apparmor = %{version}
Provides: patterns-sles-apparmor = %{version}
Obsoletes: patterns-sled-apparmor < %{version}
Obsoletes: patterns-sles-apparmor < %{version}
%endif
Requires: pattern() = minimal_base
%if 0%{?is_opensuse}
Recommends: pattern() = apparmor_opt
@ -54,11 +95,14 @@ Recommends: pattern() = apparmor_opt
Requires: apparmor-abstractions
Requires: apparmor-parser
Requires: apparmor-profiles
Recommends: apparmor-docs
Recommends: apparmor-utils
Recommends: yast2-apparmor
Suggests: pam_apparmor
%if 0%{?is_opensuse}
Requires: audit
Recommends: apparmor-utils
%else
Recommends: audit
%endif
%description apparmor
@ -116,12 +160,19 @@ This is the base runtime system. It contains only a minimal multiuser booting s
%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-order() = 1030
Provides: pattern-visible()
%if 0%{?is_opensuse}
Provides: patterns-openSUSE-base = %{version}
Obsoletes: patterns-openSUSE-base < %{version}
%else
Provides: patterns-sles-base
Provides: patterns-sles-minimal
Obsoletes: patterns-sles-base < %{version}
Obsoletes: patterns-sles-minimal < %{version}
%endif
Requires: pattern() = minimal_base
Requires: kbd
@ -133,34 +184,32 @@ Requires: shadow
Requires: util-linux
Requires: which
Recommends: bash-completion
Recommends: ca-certificates-mozilla
%ifarch ppc
Recommends: libbspe
# #739878 - install pdisk by default
Recommends: pdisk
Recommends: spu-tools
%endif
# Add some static base tool in case system explodes
Recommends: busybox-static
Recommends: ca-certificates-mozilla
Recommends: chrony
Recommends: cron
# we rely on cron for daily/hourly
Recommends: cronie
Recommends: grub2
Recommends: systemd-sysvinit
%if 0%{?is_opensuse}
# get it branded
Recommends: branding-openSUSE
%endif
%ifarch %ix86 x86_64
Recommends: grub2
%endif
%ifarch %ix86
Recommends: grub2-i386-efi
%else
Recommends: branding-SLE
%endif
%ifarch x86_64
Recommends: grub2-x86_64-efi
Recommends: shim
%endif
%ifarch ppc ppc64 ppc64le
Recommends: grub2-powerpc-ieee1275
%if !0%{?is_opensuse}
Recommends: lshw
Recommends: lsvpd
%endif
%ifarch aarch64
Recommends: grub2-arm64-efi
%endif
%ifarch ppc64 ppc64le
Recommends: ppc64-diag
%endif
%description base
@ -172,6 +221,7 @@ This is the base runtime system. It contains only a minimal multiuser booting s
################################################################################
%if 0%{?is_opensuse}
%package console
%pattern_basetechnologies
Summary: Console Tools
@ -191,7 +241,6 @@ Recommends: w3m
Suggests: lftp
Suggests: mlocate
Suggests: mutt
%if 0%{?is_opensuse}
Recommends: at
Recommends: bc
Recommends: libyui-ncurses
@ -199,7 +248,6 @@ Recommends: libyui-ncurses-pkg
Recommends: mc
Recommends: mosh
Recommends: mtools
Recommends: chrony
Recommends: sensors
Recommends: susepaste
Recommends: susepaste-screenshot
@ -222,7 +270,6 @@ Suggests: pinfo
Suggests: slrn
Suggests: units
Suggests: vlock
%endif
%description console
Applications useful for those using the console and no graphical desktop environment.
@ -230,6 +277,46 @@ Applications useful for those using the console and no graphical desktop environ
%files console
%dir %{_docdir}/patterns
%{_docdir}/patterns/console.txt
%endif
################################################################################
%package documentation
%pattern_documentation
Summary: Help and Support Documentation
Group: Metapackages
Provides: pattern() = documentation
Provides: pattern-icon() = pattern-documentation
Provides: pattern-order() = 1005
Provides: pattern-visible()
Requires: pattern() = basesystem
%if !0%{?is_opensuse}
Provides: patterns-sled-documentation
Provides: patterns-sled-documentation
Obsoletes: patterns-sles-documentation < %{version}
Obsoletes: patterns-sles-documentation < %{version}
%endif
Recommends: info2html
Recommends: man-pages
# note pam is in every install so no point in using packageand
Recommends: pam-doc
Recommends: susehelp
Recommends: susehelp_en
%if !0%{?is_opensuse}
Recommends: sled-admin_en-pdf
Recommends: sled-gnomeuser_en-pdf
Recommends: sled-manuals_en-pdf
Recommends: sled-security_en-pdf
Recommends: sled-tuning_en-pdf
%endif
%description documentation
Help and Support Documentation
%files documentation
%dir %{_docdir}/patterns
%{_docdir}/patterns/documentation.txt
################################################################################
@ -237,15 +324,19 @@ Applications useful for those using the console and no graphical desktop environ
%pattern_basetechnologies
Summary: Enhanced Base System
Group: Metapackages
Provides: patterns-openSUSE-enhanced_base = %{version}
Provides: pattern() = enhanced_base
Provides: pattern-icon() = pattern-basis
Provides: pattern-order() = 1060
Provides: pattern-visible()
%if 0%{?is_opensuse}
Provides: patterns-openSUSE-enhanced_base = %{version}
Obsoletes: patterns-openSUSE-enhanced_base < %{version}
%endif
Requires: pattern() = base
Recommends: pattern() = apparmor
%if 0%{?is_opensuse}
Recommends: pattern() = enhanced_base_opt
%endif
Recommends: pattern() = sw_management
Recommends: pattern() = yast2_basis
@ -260,13 +351,15 @@ Recommends: alsa-plugins
Recommends: attr
Recommends: autofs
Recommends: bind-utils
Recommends: binutils
# compressor is interesting
Recommends: bzip2
# #375103
Recommends: cifs-utils
Recommends: command-not-found
# we rely on cron for daily/hourly
Recommends: cpio
Recommends: cronie
Recommends: cpupower
Recommends: cryptsetup
# cups server for remote printing queues
Recommends: cups
@ -288,12 +381,15 @@ Recommends: e2fsprogs
Recommends: file
Recommends: fillup
Recommends: findutils
Recommends: fuse
Recommends: gawk
Recommends: gettext-runtime
Recommends: glibc-locale
Recommends: gpart
Recommends: gpg2
Recommends: gpm
Recommends: grep
Recommends: gzip
Recommends: hdparm
Recommends: hwinfo
Recommends: info
@ -303,41 +399,61 @@ Recommends: iproute2
# ping is required for network tests
Recommends: iputils
Recommends: irqbalance
Recommends: joe
Recommends: kmod-compat
# #303857
Recommends: kpartx
Recommends: krb5
# pager
Recommends: less
Recommends: lsscsi
Recommends: logrotate
Recommends: mailx
# man by default (#304687)
Recommends: man
# needed for detecting software raid - required by yast2-storage too
Recommends: mdadm
# TODO: If this is a requires here it should probably only be somewhere else
# or just a recommends
Requires: multipath-tools
# split out of ncurses
Recommends: ncurses-utils
Recommends: net-tools
Recommends: netcat-openbsd
Recommends: netcfg
Recommends: net-snmp
Recommends: nfs-client
Recommends: nfsidmap
Recommends: nscd
Recommends: openslp
# we want a ssh server to be available
Recommends: openssh
# TODO: should this be in more places
Recommends: pam-config
Recommends: parted
Recommends: pciutils
Recommends: pciutils-ids
Recommends: pcre
Recommends: perl-Bootloader
Recommends: perl-base
Recommends: pinentry
Recommends: popt
Recommends: postfix
# we still want /var/log/messages as all of the docu refers to it
# TODO: if we still want it everywhere it should move back to base
Recommends: rsyslog
Recommends: rsync
# Bug 424707 - Feature "Command not found" for openSUSE by default
Recommends: scout
Recommends: screen
Recommends: sed
Recommends: sg3_utils
Recommends: smartmontools
Recommends: sysconfig
Recommends: systemd-sysvinit
Recommends: tar
Recommends: time
Recommends: timezone
Recommends: translation-update
Recommends: udev
# autoconfig new printers - bnc#808014
Recommends: udev-configure-printer
@ -375,23 +491,30 @@ Recommends: powerpc32
%if 0%{?is_opensuse}
# we want a branded grub2 too #757683
Recommends: grub2-branding-openSUSE
Recommends: plymouth
Recommends: plymouth-branding-openSUSE
Recommends: release-notes-openSUSE
%else
Recommends: plymouth
Recommends: grub2-branding-SLE
%endif
# fuser (psmisc) by default (#304694)
Recommends: psmisc
Recommends: sudo
Recommends: ethtool
# mount NTFS rw (bsc#1087242)
Recommends: ntfs-3g
Recommends: ntfsprogs
# Other packages we have in openSUSE and not SLE-15
%if 0%{?is_opensuse}
Recommends: dmraid
Recommends: dosfstools
Recommends: ethtool
Recommends: ifplugd
Recommends: klogd
Recommends: lsof
Recommends: master-boot-code
# boo#1034493
Recommends: nano
# mount NTFS rw
Recommends: ntfs-3g
Recommends: ntfsprogs
Recommends: chrony
Recommends: openldap2-client
Recommends: prctl
# fuser (psmisc) by default (#304694)
@ -399,7 +522,6 @@ Recommends: psmisc
Recommends: smp_utils
# useful for debugging
Recommends: strace
Recommends: sudo
Recommends: syslinux
# having a ftp command line client is good for moving log files
Recommends: tnftp
@ -430,6 +552,7 @@ This is the enhanced base runtime system with lots of convenience packages.
################################################################################
%if 0%{?is_opensuse}
%package enhanced_base_opt
%pattern_basetechnologies
Summary: Enhanced Base System
@ -441,10 +564,9 @@ Provides: pattern-icon() = yast-software
Provides: pattern-order() = 1040
Obsoletes: patterns-openSUSE-enhanced_base_opt < %{version}
Recommends: OpenPrintingPPDs
Recommends: cracklib-dict-full
Recommends: groff
Recommends: man-pages-posix
Suggests: cracklib-dict-full
Suggests: groff
Suggests: man-pages-posix
# needed as soon as you want to do kerberos authentication
Suggests: cyrus-sasl-gssapi
Suggests: hfsutils
@ -453,10 +575,8 @@ Suggests: unzip
%ifarch %ix86 x86_64
Suggests: hyper-v
%endif
%if 0%{?is_opensuse}
Recommends: joe
Recommends: man-pages
Recommends: manufacturer-PPDs
Recommends: mpt-status
Recommends: perl-TermReadLine-Gnu
Recommends: prctl
@ -483,7 +603,6 @@ Suggests: w3m-el
Suggests: xdelta
# tool for xfs
Suggests: xfsdump
%endif
%description enhanced_base_opt
This is the enhanced base runtime system with lots of convenience packages.
@ -491,6 +610,7 @@ 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
%endif
################################################################################
@ -505,10 +625,16 @@ Provides: pattern-order() = 5190
Provides: pattern-visible()
Obsoletes: patterns-openSUSE-minimal_base < %{version}
# TODO: Can we kill minimal_base_conflicts boo#1103325
%if 0%{?is_opensuse}
Recommends: pattern() = minimal_base_conflicts
%endif
Requires: aaa_base
Requires: bash
Requires: coreutils
Requires: device-mapper
Requires: distribution-release
Requires: dracut
Requires: e2fsprogs
Requires: filesystem
@ -525,26 +651,28 @@ Requires: systemd
Requires: zypper
Recommends: btrfsprogs
Recommends: elfutils
Recommends: glibc-locale
Recommends: grub2
Recommends: iproute2
Recommends: openssh
Recommends: pattern() = minimal_base_conflicts
%if 0%{?sle_version}
Recommends: rollback-helper
%endif
Recommends: snapper
Recommends: system-group-wheel
Recommends: system-user-bin
Recommends: system-user-daemon
%if ! 0%{?is_opensuse}
Recommends: systemd-coredump
%endif
Recommends: sysvinit-tools
Recommends: udev
Suggests: ed
# rollback-helper is useful on Leap / SLE but not tumbleweed
%if 0%{?sle_version}
Recommends: rollback-helper
%endif
%if 0%{?is_opensuse}
Requires: openSUSE-build-key
Requires: openSUSE-release
%else
Requires: sles-release
Recommends: rollback_helper
Recommends: SUSEConnect
Recommends: suse-build-key
%endif
@ -552,8 +680,13 @@ Recommends: suse-build-key
Recommends: efibootmgr
%endif
%if 0%{?is_opensuse}
%description minimal_base
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.
%else
%description minimal_base
This is the minimal SLE 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.
%endif
%files minimal_base
%dir %{_docdir}/patterns
@ -561,6 +694,8 @@ This is the minimal openSUSE runtime system. It is really a minimal system, you
################################################################################
# TODO: Kill minimal_base_conflicts - Not in Leap 15
%if 0%{?is_opensuse}
%package minimal_base_conflicts
%pattern_basetechnologies
Summary: Base System
@ -589,11 +724,8 @@ Conflicts: vim-data
Conflicts: xdg-utils
# requires python
Conflicts: zypper-log
%if 0%{?is_opensuse}
# required by gio-branding
Conflicts: desktop-data-openSUSE
%endif
%if 0%{?is_opensuse}
Conflicts: bash-doc
Conflicts: bundle-lang-gnome-extras-en
# perl ~ 40MB ## - we can't conflict with that as perl-Bootloader-YAML needs it
@ -621,7 +753,6 @@ Conflicts: readline-doc
Conflicts: smtp_daemon
# supplements yast2, not needed for ncurses only
Conflicts: yast2-branding
%endif
%description minimal_base_conflicts
This is the base runtime system. It contains only a minimal multiuser booting system. For running on real hardware, you need to add additional packages and pattern to make this pattern useful on its own.
@ -629,6 +760,7 @@ This is the base runtime system. It contains only a minimal multiuser booting s
%files minimal_base_conflicts
%dir %{_docdir}/patterns
%{_docdir}/patterns/minimal_base_conflicts.txt
%endif
################################################################################
@ -643,10 +775,10 @@ Obsoletes: pattern() = readonly_root_tools
Requires: pattern() = enhanced_base
Requires: read-only-root-fs
Requires: rebootmgr
Requires: systemd-presets-branding-transactional-server
Requires: transactional-update
Suggests: health-checker
Requires: rebootmgr
%description transactional_base
This is the base system for a host updated by Transactional Updates. Includes Tools for systems with a read-only root filesystem.
@ -661,12 +793,14 @@ This is the base system for a host updated by Transactional Updates. Includes To
%pattern_basetechnologies
Summary: Software Management
Group: Metapackages
Provides: patterns-openSUSE-sw_management = %{version}
Provides: pattern() = sw_management
Provides: pattern-icon() = yast-sw_single
Provides: pattern-order() = 1360
Provides: pattern-visible()
%if 0%{?is_opensuse}
Provides: patterns-openSUSE-sw_management = %{version}
Obsoletes: patterns-openSUSE-sw_management < %{version}
%endif
Recommends: pattern() = sw_management_x11
# Zypper is the basic sw_management stack for *SUSE
@ -686,6 +820,7 @@ This pattern provides a graphical application and a command line tool for keepin
################################################################################
%if 0%{?is_opensuse}
%package update_test
%pattern_basetechnologies
Summary: Tests for the Update Stack
@ -714,6 +849,7 @@ Packages used for testing that the update stack works. These tiny packages do n
%files update_test
%dir %{_docdir}/patterns
%{_docdir}/patterns/update_test.txt
%endif
################################################################################
@ -721,21 +857,108 @@ Packages used for testing that the update stack works. These tiny packages do n
%pattern_graphicalenvironments
Summary: X Window System
Group: Metapackages
Provides: patterns-openSUSE-x11 = %{version}
Provides: pattern() = x11
Provides: pattern-icon() = yast-x11
Provides: pattern-order() = 1800
Provides: pattern-visible()
Requires: pattern() = base
%if 0%{?is_opensuse}
Provides: patterns-openSUSE-x11 = %{version}
Obsoletes: patterns-openSUSE-x11 < %{version}
%endif
%if 0%{?is_opensuse}
Recommends: pattern() = x11_enhanced
Recommends: pattern() = x11_opt
%endif
Requires: xorg-x11-fonts-core
Requires: xorg-x11-server
# bsc#1071953
%ifnarch s390 s390x
Requires: xf86-input-libinput
Recommends: xf86-input-vmmouse
Recommends: xf86-input-wacom
%endif
Recommends: xorg-x11
Recommends: x11-tools
Recommends: xorg-x11-driver-video
Recommends: xorg-x11-essentials
Recommends: xorg-x11-server-extra
Recommends: xorg-x11-fonts
# required by xdm
# Requires: xterm
# FIXME really requires ?
Requires: yast2-qt
Recommends: dejavu-fonts
Recommends: google-roboto-fonts
Recommends: icewm-theme-branding
# chooce icewm-default if you have a choice
# icewm-lite is too lightweight in new release
Recommends: icewm-default
# Recommend lightdm so it gets installed by default
# rather then xdm bsc#1081760
Recommends: lightdm
Recommends: openssh-askpass-gnome
Recommends: noto-sans-fonts
Recommends: tigervnc
# really ??
# Recommends: unclutter
Recommends: xdmbgrd
Recommends: xorg-x11-Xvnc
Recommends: xtermset
Recommends: xterm
Recommends: libyui-qt
Recommends: libyui-qt-pkg
Recommends: yast2-control-center
%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
################################################################################
%package x11_enhanced
%pattern_graphicalenvironments
Summary: X Window System
Group: Metapackages
Provides: pattern() = x11_enhanced
Provides: pattern-icon() = yast-x11
Provides: pattern-order() = 1801
#Provides: pattern-visible()
%if 0%{?is_opensuse}
Obsoletes: patterns-openSUSE-x11 < %{version}
%else
Provides: patterns-sled-minimal
Obsoletes: patterns-sled-minimal < %{version}
%endif
Requires: pattern() = enhanced_base
Requires: pattern() = fonts
Requires: pattern() = x11
Recommends: pattern() = x11_yast
%if 0%{?is_opensuse}
Recommends: pattern() = x11_opt
%endif
# 1057377
Requires: glibc-locale
Requires: xkeyboard-config
Recommends: MozillaFirefox
Recommends: MozillaFirefox-translations
Recommends: cabextract
Recommends: command-not-found
Recommends: dialog
Recommends: dbus-1-glib
Recommends: dbus-1-x11
Recommends: fontconfig
Recommends: fonts-config
Recommends: fribidi
Recommends: ghostscript-x11
Recommends: numlockx
# chooce icewm-default if you have a choice
# icewm-lite is too lightweight in new release
Recommends: icewm-default
@ -746,21 +969,18 @@ Recommends: tigervnc
# #353229 - drag in empty replacements
Recommends: translation-update
Recommends: xauth
Recommends: xdmbgrd
Recommends: xkeyboard-config
Recommends: xorg-x11-driver-video
# provides e.g. xdm
Recommends: xorg-x11-essentials
Recommends: xorg-x11-server
Recommends: xterm-bin
Recommends: xtermset
Suggests: gvim
Suggests: hexchat
# required by others
Suggests: icewm
Suggests: tk
Recommends: xorg-x11-fonts
Recommends: xorg-x11-fonts-core
Recommends: yast2-control-center-gnome
Recommends: yast2-scanner
%if 0%{?is_opensuse}
# #394406
Suggests: desktop-data-openSUSE-extra
%else
Recommends: MozillaFirefox-branding-SLE
Recommends: desktop-data-SLE
%endif
%if 0%{?is_opensuse}
# people love having numlock configurable
@ -768,18 +988,17 @@ Recommends: numlockx
Recommends: openssh-askpass
Recommends: susepaste
Recommends: susepaste-screenshot
Suggests: gvim
Suggests: hexchat
Suggests: wpa_supplicant-gui
# include boot splash for graphical environments
Recommends: plymouth
Recommends: plymouth-branding-openSUSE
%endif
%description x11
%description x11_enhanced
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
%files x11_enhanced
%dir %{_docdir}/patterns
%{_docdir}/patterns/x11.txt
%{_docdir}/patterns/x11_enhanced.txt
################################################################################
@ -800,7 +1019,6 @@ Requires: pattern() = fonts
# needed e.g. for nvidia drivers
# #302566
Recommends: x11-tools
Recommends: xdmbgrd
Recommends: xorg-x11-libX11-ccache
Suggests: xorg-x11-driver-video-radeonhd
Suggests: xorg-x11-driver-video-unichrome
@ -823,31 +1041,6 @@ The X Window System provides the only standard platform-independent networked gr
################################################################################
%package x86
%pattern_basetechnologies
Summary: x86 Runtime Environment
Group: Metapackages
Provides: patterns-openSUSE-x86 = %{version}
Provides: pattern() = x86
Provides: pattern-icon() = yast-misc
Provides: pattern-order() = 1180
Provides: pattern-visible()
Obsoletes: patterns-openSUSE-x86 < %{version}
%ifarch x86_64
Recommends: glibc-32bit
Recommends: glibc-locale-32bit
%endif
%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
################################################################################
%prep
%build
@ -855,16 +1048,39 @@ This will install the 32-bit variant of all selected patterns. This allows to ex
%install
mkdir -p %{buildroot}%{_docdir}/patterns
%if 0%{?is_opensuse}
for i in apparmor apparmor_opt base basesystem console enhanced_base \
enhanced_base_opt minimal_base minimal_base_conflicts transactional_base sw_management \
update_test x11 x11_opt x86; do
for i in apparmor base enhanced_base minimal_base \
sw_management x11 x11_enhanced; do
%else
for i in apparmor base basesystem console enhanced_base \
enhanced_base_opt minimal_base minimal_base_conflicts sw_management \
update_test x11 x86; do
for i in apparmor base enhanced_base minimal_base sw_management x11 x11_enhanced; do
%endif
echo "This file marks the pattern $i to be installed." \
>"%{buildroot}%{_docdir}/patterns/$i.txt"
echo "This file marks the pattern $i to be installed." \
>"%{buildroot}%{_docdir}/patterns/$i-32bit.txt"
done
# These packages don't generate a 32bit pattern
%if 0%{?is_opensuse}
for i in apparmor_opt basesystem console documentation minimal_base_conflicts enhanced_base_opt transactional_base update_test x11_opt; do
%else
for i in \
%ifnarch s390 s390x
32bit \
%endif
basesystem documentation; do
%endif
echo "This file marks the pattern $i to be installed." \
>"%{buildroot}%{_docdir}/patterns/$i.txt"
done
%ifarch x86_64
echo "This file marks the pattern 32bit to be installed." \
>"%{buildroot}%{_docdir}/patterns/32bit.txt"
%endif
#
# This file is created at check-in time. Sorry for the inconsistent workflow :(
#
%include %{SOURCE1}
%changelog

3
pre_checkin.sh Normal file
View File

@ -0,0 +1,3 @@
#!/bin/sh
./create_32bit-patterns_file.pl -p base -s apparmor_opt -s basesystem -s console -s documentation -s enhanced_base_opt -s minimal_base_conflicts -s readonly_root_tools -s transactional_base -s update_test -s x11_opt > pattern-definition-32bit.txt