From 7de12281d092b62ca9944927b40ad0289d027738d8ede6b53e2104c20979df2b Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Fri, 16 Apr 2021 09:43:13 +0000 Subject: [PATCH] - remove check for non-systemd distros - first out of 5 splits of "spec-cleaner -m -i *ec" run (for easier review) - Do not own system directories (like /usr/bin) (bsc#1184787): OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=1108 --- yast2-installation-4.4.3.tar.bz2 | 4 ++-- yast2-installation.changes | 8 +++++++- yast2-installation.spec | 26 +++++++++----------------- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/yast2-installation-4.4.3.tar.bz2 b/yast2-installation-4.4.3.tar.bz2 index efab63a..383bde3 100644 --- a/yast2-installation-4.4.3.tar.bz2 +++ b/yast2-installation-4.4.3.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7e860a7cfad2b661d4f3f62aa1ead7a5b3e12660e45a5adcf739b19727d4704b -size 1471116 +oid sha256:3ebdb75c00ca1d1510a3ade1b0f7cefd84056e6efc7913ed8603c6dcf90692bc +size 1470709 diff --git a/yast2-installation.changes b/yast2-installation.changes index 921de97..37cf33b 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 16 08:39:17 UTC 2021 - Dirk Müller + +- remove check for non-systemd distros +- first out of 5 splits of "spec-cleaner -m -i *ec" run (for easier review) + ------------------------------------------------------------------- Wed Apr 14 11:08:52 UTC 2021 - Knut Anderssen @@ -15,7 +21,7 @@ Wed Apr 14 09:46:38 UTC 2021 - Ludwig Nussel ------------------------------------------------------------------- Wed Apr 14 08:44:31 UTC 2021 - Dominique Leuenberger -- Do not own system directories (like /usr/bin): +- Do not own system directories (like /usr/bin) (bsc#1184787): + filesystem is responsible to bring those directories with the correct permission flags. Owning them here only introduces races/conflicts. diff --git a/yast2-installation.spec b/yast2-installation.spec index e58fa18..95069ce 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -23,7 +23,6 @@ Summary: YaST2 - Installation Parts License: GPL-2.0-only Group: System/YaST URL: https://github.com/yast/yast-installation - Source0: %{name}-%{version}.tar.bz2 Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service @@ -102,28 +101,27 @@ Requires: iproute2 %{systemd_requires} %endif +# new autoinst_files_finish call +Conflicts: autoyast2 < 4.3.26 # SingleItemSelector not enforcing an initial selection Conflicts: libyui < 3.8.2 -# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile -# pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 # InstError Conflicts: yast2 < 2.18.6 # storage-ng based version Conflicts: yast2-bootloader < 3.3.1 # Added new function WFM::ClientExists Conflicts: yast2-core < 2.17.10 -# Top bar with logo -Conflicts: yast2-ycp-ui-bindings < 3.1.7 -# Registration#get_updates_list does not handle exceptions -Conflicts: yast2-registration < 3.2.3 # Mouse-related scripts moved to yast2-mouse Conflicts: yast2-mouse < 2.18.0 -# new autoinst_files_finish call -Conflicts: autoyast2 < 4.3.26 +# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile +# pkg-bindings are not directly required +Conflicts: yast2-pkg-bindings < 2.17.25 +# Registration#get_updates_list does not handle exceptions +Conflicts: yast2-registration < 3.2.3 # moved security_finish client Conflicts: yast2-security < 4.3.11 - +# Top bar with logo +Conflicts: yast2-ycp-ui-bindings < 3.1.7 Obsoletes: yast2-installation-devel-doc Recommends: yast2-online-update @@ -170,8 +168,6 @@ install -m 644 %{SOURCE2} %{buildroot}%{_unitdir} %post %{fillup_only -ns security checksig} -%if 0%{suse_version} > 1140 - %service_add_post YaST2-Second-Stage.service YaST2-Firstboot.service # bsc#924278 Always enable these services by default, they are already listed @@ -192,11 +188,7 @@ systemctl enable YaST2-Firstboot.service %postun %service_del_postun YaST2-Second-Stage.service YaST2-Firstboot.service -#suse_version -%endif - %files - # systemd service files %{_unitdir}/YaST2-Firstboot.service %{_unitdir}/YaST2-Second-Stage.service