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

- Fix basic_desktop upgrade path for SLE-15 SP2 and later
- Put transactional_base in alphabetical order
- Fix SLE bug in generation of txt files for basic_desktop
- Re-enable purge-kernels-service dependency: dracut dropped the service.
  (boo#1161620,boo#1161780)

OBS-URL: https://build.opensuse.org/request/show/767002
OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=125
This commit is contained in:
Simon Lees 2020-02-05 21:04:01 +00:00 committed by Git OBS Bridge
parent c156cab909
commit 42dae4db69
2 changed files with 51 additions and 34 deletions

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Jan 24 01:59:33 UTC 2020 - Simon Lees <sflees@suse.de>
- Fix basic_desktop upgrade path for SLE-15 SP2 and later
- Put transactional_base in alphabetical order
- Fix SLE bug in generation of txt files for basic_desktop
-------------------------------------------------------------------
Mon Jan 20 16:06:02 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
- Re-enable purge-kernels-service dependency: dracut dropped the service.
(boo#1161620,boo#1161780)
-------------------------------------------------------------------
Tue Dec 24 08:21:37 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
- Disable purge-kernels-service dependency for now: dracut has not
yet been updated to no longer ship the service file.
-------------------------------------------------------------------
Wed Dec 18 22:07:33 UTC 2019 - Michal Suchanek <msuchanek@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package patterns-base
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -192,11 +192,6 @@ Provides: pattern() = basic_desktop
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
# XXX 2019-08-28 this package still exists so an obsolete is wrong here
%if !0%{?is_opensuse}
Obsoletes: patterns-base-x11 < %{version}
%endif
Requires: pattern() = x11
# choose icewm-default if you have a choice
@ -615,33 +610,6 @@ This is the minimal SLE runtime system. It is really a minimal system, you can l
################################################################################
%package transactional_base
%pattern_basetechnologies
Summary: Transactional Base System
Group: Metapackages
Provides: pattern() = transactional_base
Provides: pattern-icon() = pattern-kubic
Provides: pattern-order() = 1050
Requires: pattern() = base
Requires: man
Requires: read-only-root-fs
Requires: rebootmgr
Requires: systemd-presets-branding-transactional-server
Requires: transactional-update
Requires: transactional-update-zypp-config
Recommends: pattern() = enhanced_base
Suggests: health-checker
%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.
%files transactional_base
%dir %{_docdir}/patterns
%{_docdir}/patterns/transactional_base.txt
################################################################################
%package sw_management
%pattern_basetechnologies
Summary: Software Management
@ -669,6 +637,33 @@ This pattern provides a graphical application and a command line tool for keepin
################################################################################
%package transactional_base
%pattern_basetechnologies
Summary: Transactional Base System
Group: Metapackages
Provides: pattern() = transactional_base
Provides: pattern-icon() = pattern-kubic
Provides: pattern-order() = 1050
Requires: pattern() = base
Requires: man
Requires: read-only-root-fs
Requires: rebootmgr
Requires: systemd-presets-branding-transactional-server
Requires: transactional-update
Requires: transactional-update-zypp-config
Recommends: pattern() = enhanced_base
Suggests: health-checker
%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.
%files transactional_base
%dir %{_docdir}/patterns
%{_docdir}/patterns/transactional_base.txt
################################################################################
%if 0%{?is_opensuse}
%package update_test
%pattern_basetechnologies
@ -713,6 +708,9 @@ Provides: pattern-visible()
Requires: pattern() = base
%if 0%{?is_opensuse}
Recommends: pattern() = x11_enhanced
%else
# Upgrade path for SLE 15 SP1 and older
Recommends: pattern() = basic_desktop
%endif
Requires: xorg-x11-fonts-core
@ -958,7 +956,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 basic_desktop enhanced_base minimal_base sw_management x11 x11_enhanced; 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"