Accepting request 1069558 from Base:System

- Import commit d447802feee7752cd1756f8fa86ce2a6314ba24f (merge of v252.7)
  For a complete list of changes, visit:
  8e0a8094b8...d447802fee

- Fix return non-zero value when disabling SysVinit service(bsc#1208432)

- Correct BR from python3-jinja2 to python3-Jinja2, fixes
  dependency resolving on older distros

OBS-URL: https://build.opensuse.org/request/show/1069558
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=380
This commit is contained in:
Dominique Leuenberger 2023-03-07 15:48:32 +00:00 committed by Git OBS Bridge
parent c34d91ebee
commit 61822162ec
5 changed files with 28 additions and 9 deletions

View File

@ -93,10 +93,10 @@ enable_initscript() {
disable_initscript() { disable_initscript() {
for symlink in rc*.d/[SK]*; do for symlink in rc*.d/[SK]*; do
[ -L $symlink ] && [ $(readlink $symlink) = "../$1" ] && { if [ -L $symlink ] && [ $(readlink $symlink) = "../$1" ]; then
info "rm $(pwd)/$symlink" info "rm $(pwd)/$symlink"
rm $symlink rm $symlink
} fi
done done
} }

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:58501d3c453cc1c3363dd0263190d9514b34b4392f1ecaa32e9f7a2c715fa8d9
size 8090264

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fd9f697fdbb194da090ef87f472c1c6d05d16cfa49b3b668648ea6d3c8f177d2
size 8089304

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Mar 6 08:40:35 UTC 2023 - Franck Bui <fbui@suse.com>
- Import commit d447802feee7752cd1756f8fa86ce2a6314ba24f (merge of v252.7)
For a complete list of changes, visit:
https://github.com/openSUSE/systemd/compare/8e0a8094b8bbc442d262795b85ac57a37264c5fe...d447802feee7752cd1756f8fa86ce2a6314ba24f
-------------------------------------------------------------------
Tue Feb 28 02:58:20 UTC 2023 - Lidong Zhong <lidong.zhong@suse.com>
- Fix return non-zero value when disabling SysVinit service(bsc#1208432)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 27 08:43:27 UTC 2023 - Franck Bui <fbui@suse.com> Mon Feb 27 08:43:27 UTC 2023 - Franck Bui <fbui@suse.com>
@ -11,6 +24,12 @@ Mon Feb 27 08:43:27 UTC 2023 - Franck Bui <fbui@suse.com>
- aaa_base has stop providing /etc/sysctl.conf, cope with this change so the - aaa_base has stop providing /etc/sysctl.conf, cope with this change so the
compat symlink we provide is not dangling during the build. compat symlink we provide is not dangling during the build.
-------------------------------------------------------------------
Thu Feb 23 11:52:48 UTC 2023 - Callum Farmer <gmbr3@opensuse.org>
- Correct BR from python3-jinja2 to python3-Jinja2, fixes
dependency resolving on older distros
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Feb 17 11:06:41 UTC 2023 - Franck Bui <fbui@suse.com> Fri Feb 17 11:06:41 UTC 2023 - Franck Bui <fbui@suse.com>

View File

@ -19,7 +19,7 @@
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
%define min_kernel_version 4.5 %define min_kernel_version 4.5
%define archive_version +suse.48.g8e0a8094b8 %define archive_version +suse.50.gd447802fee
%define _testsuitedir /usr/lib/systemd/tests %define _testsuitedir /usr/lib/systemd/tests
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
@ -72,7 +72,7 @@
Name: systemd%{?mini} Name: systemd%{?mini}
URL: http://www.freedesktop.org/wiki/Software/systemd URL: http://www.freedesktop.org/wiki/Software/systemd
Version: 252.6 Version: 252.7
Release: 0 Release: 0
Summary: A System and Session Manager Summary: A System and Session Manager
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -108,7 +108,7 @@ BuildRequires: libcap-devel
BuildRequires: libmount-devel >= 2.27.1 BuildRequires: libmount-devel >= 2.27.1
BuildRequires: meson >= 0.53.2 BuildRequires: meson >= 0.53.2
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: python3-jinja2 BuildRequires: python3-Jinja2
# regenerate_initrd_post macro is expanded during build, hence this BR. Also # regenerate_initrd_post macro is expanded during build, hence this BR. Also
# this macro was introduced since version 12.4. # this macro was introduced since version 12.4.
BuildRequires: suse-module-tools >= 12.4 BuildRequires: suse-module-tools >= 12.4
@ -596,7 +596,7 @@ BuildRequires: pkgconfig(openssl)
%description experimental %description experimental
This package contains optional extra services that are considered as previews This package contains optional extra services that are considered as previews
and are provided so users can do early experiments with the new features or and are provided so users can do early experiments with the new features or
technologies without waiting for them to be fully supported by either upstream technologies without waiting for them to be fully supported by both upstream
and openSUSE. and openSUSE.
Please note that all services should be considered in development phase and as Please note that all services should be considered in development phase and as