From 8f5cab173367e45f7913752f6d5a41897c13c942439bcb8df55665260dac91ae Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 8 Oct 2021 10:11:10 +0000 Subject: [PATCH] - Rename %usrmerged into %split_usr OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1199 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 8 +++++--- systemd.changes | 5 +++++ systemd.spec | 8 +++++--- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 2f301ff0..b24fa8d8 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 8 09:01:59 UTC 2021 - Franck Bui + +- Rename %usrmerged into %split_usr + ------------------------------------------------------------------- Wed Oct 6 07:40:24 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index c08f0716..6e6c681c 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -56,6 +56,8 @@ %bcond_without experimental %bcond_without testsuite %endif +# Kept to ease migrations toward SLE +%bcond_with split_usr Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd @@ -605,7 +607,7 @@ Have fun with these services at your own risk. -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -%if !0%{?usrmerged} +%if %{with split_usr} -Dsplit-usr=true \ %endif -Dsplit-bin=true \ @@ -723,7 +725,7 @@ for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done -%if !0%{?usrmerged} +%if %{with split_usr} # Legacy sysvinit tools mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init @@ -1557,7 +1559,7 @@ fi %files sysvinit %defattr(-,root,root,-) -%if !0%{?usrmerged} +%if %{with split_usr} /sbin/init /sbin/reboot /sbin/halt diff --git a/systemd.changes b/systemd.changes index 2f301ff0..b24fa8d8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 8 09:01:59 UTC 2021 - Franck Bui + +- Rename %usrmerged into %split_usr + ------------------------------------------------------------------- Wed Oct 6 07:40:24 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index b4c4fba5..32d3c983 100644 --- a/systemd.spec +++ b/systemd.spec @@ -54,6 +54,8 @@ %bcond_without experimental %bcond_without testsuite %endif +# Kept to ease migrations toward SLE +%bcond_with split_usr Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd @@ -603,7 +605,7 @@ Have fun with these services at your own risk. -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -%if !0%{?usrmerged} +%if %{with split_usr} -Dsplit-usr=true \ %endif -Dsplit-bin=true \ @@ -721,7 +723,7 @@ for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done -%if !0%{?usrmerged} +%if %{with split_usr} # Legacy sysvinit tools mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init @@ -1555,7 +1557,7 @@ fi %files sysvinit %defattr(-,root,root,-) -%if !0%{?usrmerged} +%if %{with split_usr} /sbin/init /sbin/reboot /sbin/halt