Accepting request 709347 from home:simotek:branches:system:install:head
** This requires control file changes listed below ** Re add basic_desktop pattern. https://github.com/yast/skelcd-control-openSUSE/pull/189 OBS-URL: https://build.opensuse.org/request/show/709347 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=99
This commit is contained in:
Git OBS Bridge
parent
77c965b2b6
commit
2c6c5e1ded
@ -57,6 +57,8 @@ Recommends: grub2-arm-efi-32bit
|
||||
Recommends: lshw-32bit
|
||||
Recommends: lsvpd-32bit
|
||||
Recommends: ppc64-diag-32bit
|
||||
Recommends: haveged-32bit
|
||||
Recommends: issue-generator-32bit
|
||||
Provides: pattern() = base%2d32bit
|
||||
Group: Metapackages
|
||||
Supplements: packageand(patterns-base-32bit:patterns-base-base)
|
||||
@ -177,7 +179,6 @@ 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
|
||||
@ -294,13 +295,10 @@ Recommends: xorg-x11-server-32bit
|
||||
Recommends: yast2-qt-32bit
|
||||
Recommends: dejavu-fonts-32bit
|
||||
Recommends: google-roboto-fonts-32bit
|
||||
Recommends: icewm-default-32bit
|
||||
Recommends: icewm-theme-branding-32bit
|
||||
Recommends: libyui-qt-32bit
|
||||
Recommends: libyui-qt-pkg-32bit
|
||||
Recommends: lightdm-32bit
|
||||
Recommends: noto-sans-fonts-32bit
|
||||
Recommends: openssh-askpass-gnome-32bit
|
||||
Recommends: tigervnc-32bit
|
||||
Recommends: x11-tools-32bit
|
||||
Recommends: xdmbgrd-32bit
|
||||
@ -346,10 +344,7 @@ Recommends: fontconfig-32bit
|
||||
Recommends: fonts-config-32bit
|
||||
Recommends: fribidi-32bit
|
||||
Recommends: ghostscript-x11-32bit
|
||||
Recommends: icewm-default-32bit
|
||||
Recommends: lightdm-32bit
|
||||
Recommends: numlockx-32bit
|
||||
Recommends: tigervnc-32bit
|
||||
Recommends: translation-update-32bit
|
||||
Recommends: xauth-32bit
|
||||
Recommends: xdmbgrd-32bit
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 12 00:24:18 UTC 2019 - Simon Lees <sflees@suse.de>
|
||||
|
||||
- Create basic_desktop pattern containing the desktop packages like
|
||||
icewm that are wanted on a basic sles desktop but not in every
|
||||
openSUSE install (boo#1124865)
|
||||
- .Remove some duplicated packages in x11_enhanced
|
||||
- Regenerate 32bit patterns
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 2 08:16:54 UTC 2019 - lnussel@suse.de
|
||||
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%bcond_with betatest
|
||||
Name: patterns-base
|
||||
Version: 20190206
|
||||
Version: 20190612
|
||||
Release: 0
|
||||
Summary: Patterns for Installation (base patterns)
|
||||
License: MIT
|
||||
@ -248,6 +248,33 @@ This is the base runtime system. It contains only a minimal multiuser booting s
|
||||
|
||||
################################################################################
|
||||
|
||||
# This pattern contains everything the SLES x11 package used to have that
|
||||
# doesn't need to be in the openSUSE x11 package
|
||||
%package basic_desktop
|
||||
%pattern_graphicalenvironments
|
||||
Summary: A very basic desktop (previously part of x11 pattern)
|
||||
Group: Metapackages
|
||||
Provides: pattern-icon() = pattern-desktop
|
||||
Provides: pattern-order() = 1802
|
||||
Provides: pattern-visible()
|
||||
# We want SLES-15 systems to install this pattern on upgrade to SLES-16
|
||||
%if !0%{?is_opensuse}
|
||||
Obsoletes: patterns-base-x11 < %{version}
|
||||
%endif
|
||||
Requires: pattern() = x11
|
||||
|
||||
# choose icewm-default if you have a choice
|
||||
# icewm-lite is too lightweight in new release
|
||||
Requires: icewm-default
|
||||
Requires: icewm-theme-branding
|
||||
Recommends: libgnomesu
|
||||
Recommends: openssh-askpass-gnome
|
||||
|
||||
%description basic_desktop
|
||||
This pattern installs a rather basic desktop (icewm)
|
||||
|
||||
################################################################################
|
||||
|
||||
%if 0%{?is_opensuse}
|
||||
%package console
|
||||
%pattern_basetechnologies
|
||||
@ -811,17 +838,13 @@ Requires: xorg-x11-server
|
||||
Requires: yast2-qt
|
||||
Recommends: dejavu-fonts
|
||||
Recommends: google-roboto-fonts
|
||||
# choose icewm-default if you have a choice
|
||||
# icewm-lite is too lightweight in new release
|
||||
Recommends: icewm-default
|
||||
Recommends: icewm-theme-branding
|
||||
Recommends: libyui-qt
|
||||
Recommends: libyui-qt-pkg
|
||||
# Recommend lightdm so it gets installed by default
|
||||
# rather then xdm bsc#1081760
|
||||
# Todo: Require DisplayManger and suggest lightdm
|
||||
Recommends: lightdm
|
||||
Recommends: noto-sans-fonts
|
||||
Recommends: openssh-askpass-gnome
|
||||
Recommends: tigervnc
|
||||
Recommends: x11-tools
|
||||
Recommends: xdmbgrd
|
||||
@ -886,14 +909,7 @@ Recommends: fontconfig
|
||||
Recommends: fonts-config
|
||||
Recommends: fribidi
|
||||
Recommends: ghostscript-x11
|
||||
# choose 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: numlockx
|
||||
Recommends: tigervnc
|
||||
# #353229 - drag in empty replacements
|
||||
Recommends: translation-update
|
||||
Recommends: xauth
|
||||
@ -1093,7 +1109,7 @@ mkdir -p %{buildroot}%{_docdir}/patterns
|
||||
for i in apparmor base enhanced_base minimal_base \
|
||||
sw_management x11 x11_enhanced; do
|
||||
%else
|
||||
for i in apparmor base enhanced_base minimal_base sw_management x11 x11_enhanced; do
|
||||
for i in apparmor base basic_desktop 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"
|
||||
@ -1109,7 +1125,7 @@ apparmor_opt basesystem console documentation enhanced_base_opt transactional_ba
|
||||
%ifnarch s390 s390x
|
||||
32bit \
|
||||
%endif
|
||||
basesystem documentation \
|
||||
basesystem basic_desktop documentation \
|
||||
%endif
|
||||
%ifarch armv6hl armv7hl aarch64
|
||||
x11_raspberrypi \
|
||||
|
||||
@ -1,3 +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 -s x11_raspberrypi > pattern-definition-32bit.txt
|
||||
./create_32bit-patterns_file.pl -p base -s apparmor_opt -s basesystem -s basic_desktop -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 -s x11_raspberrypi > pattern-definition-32bit.txt
|
||||
|
||||
Loading…
Reference in New Issue
Block a user