From 5e75a090e6fad25f43e3c46358a2606b81359e14b1ccbfdb4fbdcd58c584d95e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 Feb 2022 15:06:53 +0000 Subject: [PATCH] Accepting request 955349 from home:favogt:branches:system:install:head - Use ntfs-3g again, udisks no longer works with the new ntfs3 module (gh#storaged-project/udisks#932) OBS-URL: https://build.opensuse.org/request/show/955349 OBS-URL: https://build.opensuse.org/package/show/system:install:head/patterns-base?expand=0&rev=203 --- patterns-base.changes | 6 ++++++ patterns-base.spec | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/patterns-base.changes b/patterns-base.changes index fe89512..e6943fc 100644 --- a/patterns-base.changes +++ b/patterns-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 16 12:14:23 UTC 2022 - Fabian Vogt + +- Use ntfs-3g again, udisks no longer works with the new ntfs3 module + (gh#storaged-project/udisks#932) + ------------------------------------------------------------------- Mon Feb 7 13:14:41 UTC 2022 - Dominique Leuenberger diff --git a/patterns-base.spec b/patterns-base.spec index 351991a..28bd380 100644 --- a/patterns-base.spec +++ b/patterns-base.spec @@ -68,10 +68,10 @@ Provides: pattern() = apparmor Provides: pattern-icon() = pattern-apparmor Provides: pattern-order() = 1100 Provides: pattern-visible() -Requires: pattern() = minimal_base Requires: apparmor-abstractions Requires: apparmor-parser Requires: apparmor-profiles +Requires: pattern() = minimal_base Recommends: apparmor-docs Recommends: apparmor-utils Recommends: yast2-apparmor @@ -117,7 +117,6 @@ Provides: pattern() = base Provides: pattern-icon() = pattern-basis Provides: pattern-order() = 1030 Provides: pattern-visible() -Requires: pattern() = minimal_base Requires: aaa_base Requires: bash Requires: ca-certificates-mozilla @@ -126,6 +125,7 @@ Requires: glibc Requires: libnss_usrfiles2 Requires: pam Requires: pam-config +Requires: pattern() = minimal_base # Support multiversion(kernel) (jsc#SLE-10162) Requires: purge-kernels-service Requires: rpm @@ -296,8 +296,8 @@ Provides: pattern() = documentation Provides: pattern-icon() = pattern-documentation Provides: pattern-order() = 1005 Provides: pattern-visible() -Requires: pattern() = minimal_base Requires: man +Requires: pattern() = minimal_base Recommends: man-pages # note pam is in every install so no point in using packageand Recommends: pam-manpages @@ -396,11 +396,13 @@ Recommends: netcfg Recommends: nfs-client Recommends: nfsidmap Recommends: nscd -# Kernel 5.15+ has an improved R/W ntfs module -%if 0%{?suse_version} < 1550 +# Kernel 5.15+ has an improved R/W ntfs module. +# Use ntfs-3g anyway because udisks has issues with mount option handling: +# https://github.com/storaged-project/udisks/issues/932 +#if 0%{?suse_version} < 1550 # mount NTFS rw (bsc#1087242) Recommends: ntfs-3g -%endif +#endif Recommends: ntfsprogs # TODO: should this be in more places Recommends: pam-config @@ -673,11 +675,11 @@ Provides: pattern() = selinux Provides: pattern-icon() = pattern-selinux Provides: pattern-order() = 1110 Provides: pattern-visible() -Requires: pattern() = minimal_base Requires: policycoreutils Requires: selinux-autorelabel Requires: selinux-policy Requires: selinux-tools +Requires: pattern() = minimal_base Recommends: checkpolicy Recommends: container-selinux Recommends: restorecond @@ -727,12 +729,12 @@ Group: Metapackages Provides: pattern() = transactional_base Provides: pattern-icon() = pattern-kubic Provides: pattern-order() = 1050 -Requires: pattern() = base Requires: read-only-root-fs Requires: rebootmgr Requires: systemd-presets-branding-transactional-server Requires: transactional-update Requires: transactional-update-zypp-config +Requires: pattern() = base Suggests: health-checker %description transactional_base