From c963e461dda84b54afbb58e0b67b594ad1fe827ce473badd093de563ab817b84 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 16 Feb 2023 11:42:49 +0000 Subject: [PATCH] - Reorder source files and patches OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=142 --- shadow.changes | 2 +- shadow.spec | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/shadow.changes b/shadow.changes index 20e3911..1b4f844 100644 --- a/shadow.changes +++ b/shadow.changes @@ -2,7 +2,7 @@ Thu Feb 16 11:31:33 UTC 2023 - Michael Vetter - Update shadow-fix-print-login-timeout.patch -- Reorder source files +- Reorder source files and patches ------------------------------------------------------------------- Wed Feb 15 10:49:33 UTC 2023 - Ludwig Nussel diff --git a/shadow.spec b/shadow.spec index 6d4404a..4fe2523 100644 --- a/shadow.spec +++ b/shadow.spec @@ -39,21 +39,21 @@ Source40: shadow-login_defs-check.sh # PATCH-FIX-SUSE shadow-login_defs-unused-by-pam.patch kukuk@suse.com -- Remove variables that have no use with PAM. Patch0: shadow-login_defs-unused-by-pam.patch # PATCH-FEATURE-SUSE useradd-default.patch kukuk@suse.com -- Change useradd defaults group to 1000. -Patch3: useradd-default.patch +Patch1: useradd-default.patch # PATCH-FEATURE-SUSE shadow-util-linux.patch sbrabec@suse.com -- Add support for util-linux specific variables, delete shadow login, su runuser specific. -Patch4: shadow-util-linux.patch +Patch2: shadow-util-linux.patch # PATCH-FEATURE-SUSE shadow-login_defs-comments.patch kukuk@suse.com -- Adjust login.defs comments. -Patch5: shadow-login_defs-comments.patch +Patch3: shadow-login_defs-comments.patch # PATCH-FEATURE-SUSE shadow-login_defs-suse.patch kukuk@suse.com -- Customize login.defs. -Patch6: shadow-login_defs-suse.patch +Patch4: shadow-login_defs-suse.patch # PATCH-FEATURE-SUSE Copy also skeleton files from /usr/etc/skel (boo#1173321) (gh/shadow-maint/shadow#591) -Patch7: useradd-userkeleton.patch +Patch5: useradd-userkeleton.patch # PATCH-FIX-SUSE disable_new_audit_function.patch adam.majer@suse.de -- Disable newer libaudit functionality for older distributions. -Patch8: disable_new_audit_function.patch +Patch6: disable_new_audit_function.patch # PATCH-FIX-UPSTREAM shadow-audit-no-id.patch mvetter@suse.com -- Fix useradd audit event logging of ID field (bsc#1205502) (gh/shadow-maint/shadow#606) -Patch9: shadow-audit-no-id.patch +Patch7: shadow-audit-no-id.patch # PATCH-FIX-UPSTREAM shadow-fix-print-login-timeout.patch mvetter@suse.com -- Fix print full login timeout message (gh/shadow-maint/shadow#621) -Patch10: shadow-fix-print-login-timeout.patch +Patch8: shadow-fix-print-login-timeout.patch BuildRequires: audit-devel > 2.3 BuildRequires: autoconf BuildRequires: automake @@ -113,16 +113,16 @@ Development files for libsubid4. %prep %setup -q -a 1 %patch0 +%patch1 +%patch2 %patch3 %patch4 %patch5 -%patch6 -%patch7 %if 0%{?suse_version} < 1330 -%patch8 -p1 +%patch6 -p1 %endif -%patch9 -p1 -%patch10 -p1 +%patch7 -p1 +%patch8 -p1 iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 mv -v doc/HOWTO.utf8 doc/HOWTO