From 415a3c25d952e152c3a168458ea698ae418452d70ab4c6df71abab116106ca2c Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 5 Mar 2020 15:15:08 +0000 Subject: [PATCH 1/4] Accepting request 780478 from home:hellcp:branches:system:install:head Pull the correct distribution-logos per distribution theme OBS-URL: https://build.opensuse.org/request/show/780478 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1275 --- installation-images.changes | 5 +++++ installation-images.spec | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/installation-images.changes b/installation-images.changes index b64efb2..dda256d 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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..6079d6b 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 +%elsif +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" From fd81898e6c8fbb783685a53c927e393335306e3a6b0d796e596157c6adffe16a Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Fri, 6 Mar 2020 09:57:04 +0000 Subject: [PATCH 2/4] fix spec OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1276 --- installation-images.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation-images.spec b/installation-images.spec index 6079d6b..35acda9 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -145,7 +145,7 @@ BuildRequires: openSUSE-release BuildRequires: adobe-sourcesanspro-fonts %if 0%{?is_opensuse} && !0%{?sle_version} BuildRequires: distribution-logos-openSUSE-Tumbleweed -%elsif +%else BuildRequires: distribution-logos-openSUSE-Leap %endif %endif From ab301953632f64755bd62e4b9796793951e5048771e7a89670e8ae6890bb5c5b Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Fri, 6 Mar 2020 12:17:20 +0000 Subject: [PATCH 3/4] - release 14.460 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1277 --- installation-images-14.459.tar.xz | 3 --- installation-images-14.460.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.459.tar.xz create mode 100644 installation-images-14.460.tar.xz 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.460.tar.xz b/installation-images-14.460.tar.xz new file mode 100644 index 0000000..a6a7958 --- /dev/null +++ b/installation-images-14.460.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:812f52d3cc1569c6ee4d6f420e34a6a2fdc2c4cac2df13da6fc4d6939e17073d +size 172144 diff --git a/installation-images.changes b/installation-images.changes index dda256d..810a038 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +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 diff --git a/installation-images.spec b/installation-images.spec index 35acda9..5988624 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -617,7 +617,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.459 +Version: 14.460 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) From a03322e4e2ab5a490c5f559cf7d1ae4588b157a849a028fd05b2d55b2dd6d7c0 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 9 Mar 2020 10:37:21 +0000 Subject: [PATCH 4/4] - release 14.461 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1278 --- installation-images-14.460.tar.xz | 3 --- installation-images-14.461.tar.xz | 3 +++ installation-images.changes | 8 ++++++++ installation-images.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.460.tar.xz create mode 100644 installation-images-14.461.tar.xz diff --git a/installation-images-14.460.tar.xz b/installation-images-14.460.tar.xz deleted file mode 100644 index a6a7958..0000000 --- a/installation-images-14.460.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:812f52d3cc1569c6ee4d6f420e34a6a2fdc2c4cac2df13da6fc4d6939e17073d -size 172144 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 810a038..50e3171 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,11 @@ +-------------------------------------------------------------------- +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 diff --git a/installation-images.spec b/installation-images.spec index 5988624..f8ae71a 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -617,7 +617,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.460 +Version: 14.461 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)