diff --git a/installation-images-16.30.tar.xz b/installation-images-16.30.tar.xz deleted file mode 100644 index 7c402b7..0000000 --- a/installation-images-16.30.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba020b7b920db3812a3a23e4fe08d0b24ae3a9246b151cc51ae68d91884fe873 -size 204840 diff --git a/installation-images-16.31.tar.xz b/installation-images-16.31.tar.xz new file mode 100644 index 0000000..abc9035 --- /dev/null +++ b/installation-images-16.31.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d5c2e0eb03b1e2bffb6b989190d6e0844192c5487375f98c91dfa9dd1f74c7d +size 204872 diff --git a/installation-images.changes b/installation-images.changes index d885122..a7f974e 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,11 @@ +-------------------------------------------------------------------- +Fri Jan 22 15:17:20 UTC 2021 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#443 +- revert plymouth branding for SLE to tribar +- support both plymouth-theme-tribar and plymouth-theme-bgrt +- 16.31 + -------------------------------------------------------------------- Thu Jan 21 13:55:40 UTC 2021 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 032a701..1a12f9a 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -437,13 +437,6 @@ BuildRequires: perl-XML-Parser BuildRequires: perl-XML-Simple BuildRequires: perl-solv BuildRequires: pinentry -# SLE lacks bgrt/spinner branding image and doesn't require bgrt theme -# in their branding, so using default bgrt theme package -%if 0%{?is_opensuse} -BuildRequires: plymouth-branding-openSUSE -%else -BuildRequires: plymouth-theme-bgrt -%endif BuildRequires: python3-websockify BuildRequires: raleway-fonts BuildRequires: samba @@ -463,6 +456,12 @@ BuildRequires: plymouth BuildRequires: plymouth-branding BuildRequires: plymouth-plugin-script BuildRequires: plymouth-scripts +# SLE needs to stay with tribar +%if 0%{?is_opensuse} +BuildRequires: plymouth-branding-openSUSE +%else +BuildRequires: plymouth-theme-tribar +%endif %endif BuildRequires: klogd BuildRequires: ltrace @@ -654,7 +653,7 @@ AutoReqProv: off Summary: Installation Image Files for %theme License: GPL-2.0-or-later Group: Metapackages -Version: 16.30 +Version: 16.31 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)