diff --git a/installation-images-14.459.tar.xz b/installation-images-14.459.tar.xz deleted file mode 100644 index a16633a..0000000 --- a/installation-images-14.459.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:459de940603878e0fbd2a12c82f1bda486c34434057cd119f51633ffed640fb6 -size 172092 diff --git a/installation-images-14.461.tar.xz b/installation-images-14.461.tar.xz new file mode 100644 index 0000000..b9491f6 --- /dev/null +++ b/installation-images-14.461.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dfbaec9f9621bf6ef293f5c0b4b60288a88f00b2b3da8509ca9558d0bc4a316 +size 172248 diff --git a/installation-images.changes b/installation-images.changes index b64efb2..50e3171 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,23 @@ +-------------------------------------------------------------------- +Mon Mar 9 10:33:04 UTC 2020 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#363 +- adapt system-user-* and system-group-* package handling + (bsc#1163938) +- 14.461 + +-------------------------------------------------------------------- +Fri Mar 6 12:16:11 UTC 2020 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#362 +- fix rescue system setup (bsc#1160378) +- 14.460 + +------------------------------------------------------------------- +Sat Feb 29 10:05:05 UTC 2020 - Stasiek Michalski + +- Pull the correct distribution-logos per distribution theme + -------------------------------------------------------------------- Wed Feb 26 10:46:23 UTC 2020 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 21d3502..f8ae71a 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -143,6 +143,11 @@ ExclusiveArch: do_not_build %define branding_gfxboot openSUSE BuildRequires: openSUSE-release BuildRequires: adobe-sourcesanspro-fonts +%if 0%{?is_opensuse} && !0%{?sle_version} +BuildRequires: distribution-logos-openSUSE-Tumbleweed +%else +BuildRequires: distribution-logos-openSUSE-Leap +%endif %endif %if "%theme" == "Kubic" @@ -156,6 +161,7 @@ BuildRequires: adobe-sourcesanspro-fonts %define config_bootmenu_no_upgrade 1 BuildRequires: openSUSE-MicroOS-release BuildRequires: adobe-sourcesanspro-fonts +BuildRequires: distribution-logos-openSUSE-Kubic # Kubic is based on MicroOS but we don't want this to show # note: keep this in sync with the Kubic settings in etc/config @@ -173,6 +179,7 @@ BuildRequires: adobe-sourcesanspro-fonts %define config_bootmenu_no_upgrade 1 BuildRequires: openSUSE-MicroOS-release BuildRequires: adobe-sourcesanspro-fonts +BuildRequires: distribution-logos-openSUSE-MicroOS %endif %if "%theme" == "SLED" @@ -610,7 +617,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.459 +Version: 14.461 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)