From e29c1e2c9f2732376cd9ac3263f21f4ab256f875d35ca78e392a99eff8e95fbb Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 5 May 2020 12:19:23 +0000 Subject: [PATCH 1/3] - Use requires in update-test pattern so it also works when installing with recommends disabled. - Require update-test pattern from sw_management pattern instead of subtle supplements for same reason. OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=136 --- patterns-base.changes | 8 ++++++++ patterns-base.spec | 20 +++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index 9a276ad..63887e1 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 5 12:17:31 UTC 2020 - Ludwig Nussel + +- Use requires in update-test pattern so it also works when + installing with recommends disabled. +- Require update-test pattern from sw_management pattern instead of + subtle supplements for same reason. + ------------------------------------------------------------------- Mon Apr 27 08:23:48 UTC 2020 - Ludwig Nussel diff --git a/patterns-base.spec b/patterns-base.spec index 5a66f3a..188abe8 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -18,7 +18,7 @@ %bcond_with betatest Name: patterns-base -Version: 20200417 +Version: 20200505 Release: 0 Summary: Patterns for Installation (base patterns) License: MIT @@ -614,6 +614,9 @@ Provides: pattern-icon() = pattern-software-management Provides: pattern-order() = 1360 Provides: pattern-visible() %obsolete_legacy_pattern sw_management +%if %{with betatest} +Requires: pattern() = update_test +%endif # Zypper is the basic sw_management stack for *SUSE Requires: zypper %if 0%{?sle_version} @@ -668,15 +671,14 @@ Provides: pattern-order() = 1380 Provides: pattern-visible() %obsolete_legacy_pattern update_test -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 +Requires: update-test-affects-package-manager +Requires: update-test-interactive +Requires: update-test-optional +Requires: update-test-reboot-needed +Requires: update-test-security +Requires: update-test-trival %if %{with betatest} -Recommends: aaa_base-malloccheck -Supplements: %{name}-base +Requires: aaa_base-malloccheck %endif %description update_test From 5b509903af9c68be2a5dc608571bc8ec7116a93c601c075a066a39140b818f3f Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 5 May 2020 15:49:44 +0000 Subject: [PATCH 2/3] typo OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=137 --- patterns-base.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patterns-base.spec b/patterns-base.spec index 188abe8..862c7f4 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -676,7 +676,7 @@ Requires: update-test-interactive Requires: update-test-optional Requires: update-test-reboot-needed Requires: update-test-security -Requires: update-test-trival +Requires: update-test-trivial %if %{with betatest} Requires: aaa_base-malloccheck %endif From 59d19c21bac0c8641341fec65265ab6c080ab7073deb496f5750f2d9f332e07e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 7 May 2020 09:24:24 +0000 Subject: [PATCH 3/3] Accepting request 801085 from home:favogt:branches:system:install:head - Require pam_pwquality in base as it's the replacement for pam_cracklib, previously part of the required pam package - basic_desktop: Fix icon OBS-URL: https://build.opensuse.org/request/show/801085 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=138 --- patterns-base.changes | 11 +++++++++++ patterns-base.spec | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/patterns-base.changes b/patterns-base.changes index 63887e1..5193c90 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 7 09:19:47 UTC 2020 - Fabian Vogt + +- Require pam_pwquality in base as it's the replacement for + pam_cracklib, previously part of the required pam package + ------------------------------------------------------------------- Tue May 5 12:17:31 UTC 2020 - Ludwig Nussel @@ -6,6 +12,11 @@ Tue May 5 12:17:31 UTC 2020 - Ludwig Nussel - Require update-test pattern from sw_management pattern instead of subtle supplements for same reason. +------------------------------------------------------------------- +Tue Apr 28 07:01:26 UTC 2020 - Fabian Vogt + +- basic_desktop: Fix icon + ------------------------------------------------------------------- Mon Apr 27 08:23:48 UTC 2020 - Ludwig Nussel diff --git a/patterns-base.spec b/patterns-base.spec index 862c7f4..39aab69 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -131,6 +131,7 @@ Requires: glibc Requires: libnss_usrfiles2 Requires: pam Requires: pam-config +Requires: pam_pwquality Requires: rpm Requires: shadow Requires: sysconfig @@ -181,7 +182,7 @@ This is the base runtime system. It contains only a minimal multiuser booting s Summary: A very basic desktop (previously part of x11 pattern) Group: Metapackages Provides: pattern() = basic_desktop -Provides: pattern-icon() = pattern-desktop +Provides: pattern-icon() = pattern-x11 Provides: pattern-order() = 1802 Provides: pattern-visible() Requires: pattern() = x11