From 9d8cc59e9c64de4ac9afce251ce0ae20de6c7e4ebee7d61fd6a108af291476c2 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 26 Jan 2022 10:22:26 +0000 Subject: [PATCH] - release 17.39 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1437 --- installation-images-17.38.tar.xz | 3 --- installation-images-17.39.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 8 ++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) delete mode 100644 installation-images-17.38.tar.xz create mode 100644 installation-images-17.39.tar.xz diff --git a/installation-images-17.38.tar.xz b/installation-images-17.38.tar.xz deleted file mode 100644 index 72b6110..0000000 --- a/installation-images-17.38.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5887dcafba6cb28d9d315612651b9b57dfe4873f338d2475a02b9e5958d0b00d -size 243532 diff --git a/installation-images-17.39.tar.xz b/installation-images-17.39.tar.xz new file mode 100644 index 0000000..3647673 --- /dev/null +++ b/installation-images-17.39.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0eac42b2c5515eaad291e1808ea1988e4a3406b27ff49b1923d05d6473f89d44 +size 243596 diff --git a/installation-images.changes b/installation-images.changes index b7ec6b6..ccc8e76 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Wed Jan 26 10:21:07 UTC 2022 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#571 +- use for build proper schema flavor (jsc#SLE-18820) +- 17.39 + -------------------------------------------------------------------- Tue Jan 25 10:38:14 UTC 2022 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index b248622..58d5bb6 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -546,7 +546,11 @@ BuildRequires: xset BuildRequires: xterm BuildRequires: xz BuildRequires: yast2-devtools -BuildRequires: yast2-schema +%if "%flavor" == "SMO" || "%flavor" == "LeapMicro" || "%flavor" == "MicroOS" +BuildRequires: yast2-schema-micro +%else +BuildRequires: yast2-schema-default +%endif BuildRequires: yast2-trans-allpacks BuildRequires: yast2-widget-demo %if 0%{?with_storage_ng} @@ -687,7 +691,7 @@ AutoReqProv: off Summary: Installation Image Files for %theme License: GPL-2.0-or-later Group: Metapackages -Version: 17.38 +Version: 17.39 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)