From 8be4acb1a0e8efca9e0d93c28fdfe79781b24826 Mon Sep 17 00:00:00 2001 From: Bernhard M. Wiedemann Date: Dec 02 2021 00:41:39 +0000 Subject: update 2021-12-02 00:41 --- diff --git a/packages/_/_project/_attribute b/packages/_/_project/_attribute index 89a36d9..31fc9d4 100644 --- a/packages/_/_project/_attribute +++ b/packages/_/_project/_attribute @@ -196,7 +196,7 @@ bad-rpmlint-entries = suse-dbus-unauthorized-service suse-pam-unauthorized-modul s/openSUSE-/openSUSE-Staging:$LETTER-/ - 20211130 + 20211201 arch: x86_64 diff --git a/packages/_/_project/_config b/packages/_/_project/_config index a2e6971..10ec71a 100644 --- a/packages/_/_project/_config +++ b/packages/_/_project/_config @@ -158,6 +158,10 @@ Prefer: -moonjit-devel Preinstall: liblua5_4-5 FileProvides: /bin/bash bash +%if "%{_repository}" == "standard" +FileProvides: /bin/sh bash-sh busybox-sh +%endif +Prefer: bash-sh FileProvides: /bin/csh tcsh FileProvides: /bin/hostname hostname busybox-hostname FileProvides: /usr/bin/hostname hostname busybox-hostname @@ -206,6 +210,9 @@ FileProvides: /sbin/pidof sysvinit-tools FileProvides: /sbin/ifup wicked-service Preinstall: aaa_base attr bash coreutils diffutils +%if "%{_repository}" == "standard" +Preinstall: bash-sh +%endif Preinstall: filesystem fillup glibc grep Preinstall: libbz2-1 libgcc_s1 libncurses6 pam Prefer: -pam_unix-nis @@ -1556,12 +1563,12 @@ Runscripts: cputype-armv7 Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type %%{?_lto_cflags} # 15.5 does not exist ! -%define suse_version 1550 +%define suse_version 1599 %define is_opensuse 1 %define skelcd_compat 0 Macros: -%suse_version 1550 +%suse_version 1599 %is_opensuse 1 %skelcd_compat 0 diff --git a/packages/_/_project/_staging_workflow b/packages/_/_project/_staging_workflow index f11ff85..23f65fd 100644 --- a/packages/_/_project/_staging_workflow +++ b/packages/_/_project/_staging_workflow @@ -23,52 +23,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +