diff --git a/yast2-installation-4.4.3.tar.bz2 b/yast2-installation-4.4.3.tar.bz2 index 383bde3..f9d06c6 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:3ebdb75c00ca1d1510a3ade1b0f7cefd84056e6efc7913ed8603c6dcf90692bc -size 1470709 +oid sha256:e7b164bc9850ec92ce17ae42766a5de20b312c337e9a549ac56087447447a95c +size 1470730 diff --git a/yast2-installation.changes b/yast2-installation.changes index 37cf33b..0067bdd 100644 --- a/yast2-installation.changes +++ b/yast2-installation.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 16 09:50:49 UTC 2021 - Dirk Müller + +- spec-cleaner part two out of five: move conditionalized sections at the end +- spec-cleaner part three out of five: move weak requires (recommends) below requires +- spec-cleaner part four out of five: sort and deduplicate BuildRequires + ------------------------------------------------------------------- Fri Apr 16 08:39:17 UTC 2021 - Dirk Müller diff --git a/yast2-installation.spec b/yast2-installation.spec index 95069ce..c0f6dd2 100644 --- a/yast2-installation.spec +++ b/yast2-installation.spec @@ -28,32 +28,31 @@ Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service BuildRequires: update-desktop-files +# Yast2::FsSnapshotStore::IOError +BuildRequires: yast2 >= 4.3.53 +# CIOIgnore +BuildRequires: yast2-bootloader +# storage-ng based version +BuildRequires: yast2-country >= 3.3.1 BuildRequires: yast2-devtools >= 3.1.10 +# For firewall widgets +BuildRequires: yast2-firewall +# Y2Network::NtpServer +BuildRequires: yast2-network >= 4.2.55 +# Y2Packager::MediumType +BuildRequires: yast2-packager >= 4.2.27 # for AbortException and handle direct abort BuildRequires: yast2-ruby-bindings >= 4.0.6 +# For selinux classes +BuildRequires: yast2-security +# using /usr/bin/udevadm +BuildRequires: yast2-storage-ng >= 4.2.71 +# new root password cwm widget +BuildRequires: yast2-users >= 3.2.8 # needed for xml agent reading about products BuildRequires: yast2-xml BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) -# Yast2::FsSnapshotStore::IOError -BuildRequires: yast2 >= 4.3.53 -# Y2Packager::MediumType -BuildRequires: yast2-packager >= 4.2.27 -# CIOIgnore -BuildRequires: yast2-bootloader -# For selinux classes -BuildRequires: yast2-security -# For firewall widgets -BuildRequires: yast2-firewall -# using /usr/bin/udevadm -BuildRequires: yast2-storage-ng >= 4.2.71 -# Y2Network::NtpServer -BuildRequires: yast2-network >= 4.2.55 -# new root password cwm widget -BuildRequires: yast2-users >= 3.2.8 -# storage-ng based version -BuildRequires: yast2-bootloader -BuildRequires: yast2-country >= 3.3.1 PreReq: %fillup_prereq Requires: yast2-country >= 3.3.1 @@ -97,10 +96,10 @@ Requires: yast2-ruby-bindings >= 4.0.6 Requires: pciutils # Needed call /sbin/ip in vnc.sh/network.sh Requires: iproute2 -%if 0%{?suse_version} >= 1210 -%{systemd_requires} -%endif - +Recommends: yast2-add-on +Recommends: yast2-firewall +Recommends: yast2-online-update +Supplements: autoyast(deploy_image:ssh_import) # new autoinst_files_finish call Conflicts: autoyast2 < 4.3.26 # SingleItemSelector not enforcing an initial selection @@ -123,14 +122,10 @@ 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 -Recommends: yast2-firewall -Recommends: yast2-add-on - -Supplements: autoyast(deploy_image:ssh_import) - BuildArch: noarch +%if 0%{?suse_version} >= 1210 +%{systemd_requires} +%endif %description System installation code as present on installation media.