From 6265cca20bb1136e44acae977ceec283f5bfff174093bb19abf6b3f14266561e Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 8 Jan 2018 10:22:56 +0000 Subject: [PATCH 1/5] - release 14.350 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1097 --- installation-images-14.349.tar.xz | 3 --- installation-images-14.350.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.349.tar.xz create mode 100644 installation-images-14.350.tar.xz diff --git a/installation-images-14.349.tar.xz b/installation-images-14.349.tar.xz deleted file mode 100644 index e08f68e..0000000 --- a/installation-images-14.349.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ce79e0564d5107828452351d95b43675ccf2c7f7ac286ddbda34240cced00e6 -size 173884 diff --git a/installation-images-14.350.tar.xz b/installation-images-14.350.tar.xz new file mode 100644 index 0000000..bebe2d9 --- /dev/null +++ b/installation-images-14.350.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1980a791cb9c26a62ca4d554df5ed82351cfea1bd4e78e6daa6929d44354beb +size 173876 diff --git a/installation-images.changes b/installation-images.changes index c4d3eee..16e7c75 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Mon Jan 8 10:20:41 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#223 +- create user/group entries for chrony (fate#323432) +- 14.350 + -------------------------------------------------------------------- Thu Dec 14 14:38:53 UTC 2017 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index cc32aa8..da26092 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -537,7 +537,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.349 +Version: 14.350 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) From 00d8e60d5b7f5953b6e045bce3ea1011b8fed852c0a9686940172cb73322534f Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 8 Jan 2018 16:56:01 +0000 Subject: [PATCH 2/5] - clean up spec file and remove support for pre-sle15 distros OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1098 --- installation-images.changes | 5 ++++ installation-images.spec | 50 ++++++------------------------------- 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/installation-images.changes b/installation-images.changes index 16e7c75..118766d 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 8 17:52:49 CET 2018 - snwint@suse.de + +- clean up spec file and remove support for pre-sle15 distros + -------------------------------------------------------------------- Mon Jan 8 10:20:41 UTC 2018 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index da26092..bb3d647 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -1,7 +1,7 @@ # # spec file for package installation-images # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,6 @@ ExclusiveArch: do_not_build %define with_plymouth 1 %define with_shim 1 %define with_storage_ng 1 -%define with_libinput 1 %bcond_without sbl %bcond_without vnc %bcond_with xen @@ -92,10 +91,6 @@ ExclusiveArch: do_not_build %define branding_grub2 openSUSE %define branding_gfxboot openSUSE BuildRequires: openSUSE-release -# only for Leap-42.3 on x86_64 (bsc#1043146): -%if "%{?sle_version}" == "120300" && "%{_target_cpu}" == "x86_64" -BuildRequires: drm-kmp-default -%endif %endif %if "%theme" == "Kubic" @@ -114,13 +109,7 @@ BuildRequires: openSUSE-Tumbleweed-Kubic-release %define branding_plymouth SLE %define branding_grub2 SLE %define branding_gfxboot SLE -BuildRequires: sled-release -%if 0%{?sle_version} != 0150000 -%define with_storage_ng 0 -%define with_libinput 0 -BuildRequires: sled-release-DVD -BuildRequires: sle12-desktop-migration -%endif +BuildRequires: unified-installer-release %endif %if "%theme" == "SLES" @@ -129,16 +118,7 @@ BuildRequires: sle12-desktop-migration %define branding_plymouth SLE %define branding_grub2 SLE %define branding_gfxboot SLE -BuildRequires: sles-release -%if 0%{?sle_version} != 0150000 -%define with_storage_ng 0 -%define with_libinput 0 -BuildRequires: sles-release-DVD -BuildRequires: sle12-desktop-migration -%ifarch x86_64 ppc64le -BuildRequires: sap-installation-wizard -%endif -%endif +BuildRequires: unified-installer-release %endif %if "%theme" == "SLES_SAP" @@ -147,14 +127,7 @@ BuildRequires: sap-installation-wizard %define branding_plymouth SLE %define branding_grub2 SLE %define branding_gfxboot SLE -BuildRequires: SLES_SAP-installation-release -%if 0%{?sle_version} != 0150000 -%define with_storage_ng 0 -%define with_libinput 0 -BuildRequires: sles-release-DVD -BuildRequires: sle12-desktop-migration -BuildRequires: sap-installation-wizard -%endif +BuildRequires: unified-installer-release %endif %if "%theme" == "CAASP" @@ -165,11 +138,6 @@ BuildRequires: sap-installation-wizard %define branding_gfxboot SLE %define config_bootmenu_no_upgrade 1 BuildRequires: caasp-release -%if 0%{?sle_version} != 0150000 -%define with_storage_ng 0 -%define with_libinput 0 -BuildRequires: caasp-release-DVD -%endif %endif # === set product string (based on required packages) === @@ -197,11 +165,9 @@ BuildRequires: grub2-branding-%branding_grub2 ExcludeArch: %ix86 %endif -%if 0%{?with_libinput} %ifnarch s390x BuildRequires: xf86-input-libinput %endif -%endif BuildRequires: google-roboto-fonts BuildRequires: noto-sans-fonts %ifarch ia64 %ix86 x86_64 @@ -398,6 +364,7 @@ BuildRequires: wireless-tools %ifnarch s390 s390x BuildRequires: wpa_supplicant %endif +BuildRequires: chrony BuildRequires: xauth BuildRequires: xdm BuildRequires: xdpyinfo @@ -407,7 +374,6 @@ BuildRequires: xhost BuildRequires: xkbcomp BuildRequires: xkeyboard-config BuildRequires: xmodmap -BuildRequires: chrony BuildRequires: xorg-x11-fonts BuildRequires: xorg-x11-server BuildRequires: xrandr @@ -452,10 +418,10 @@ BuildRequires: iprutils %endif BuildRequires: kbd %ifarch %ix86 x86_64 -BuildRequires: xf86-video-intel -BuildRequires: xf86-video-vesa -BuildRequires: xf86-video-qxl BuildRequires: xf86-video-amdgpu +BuildRequires: xf86-video-intel +BuildRequires: xf86-video-qxl +BuildRequires: xf86-video-vesa %endif BuildRequires: xf86-input-wacom BuildRequires: xf86-video-fbdev From 3bdb4a258b6896b5371fc16fcabdf9fc7b8f6a2e691c03dd28ccf10e501717f8 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 8 Jan 2018 16:57:34 +0000 Subject: [PATCH 3/5] - release 14.351 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1099 --- installation-images-14.350.tar.xz | 3 --- installation-images-14.351.tar.xz | 3 +++ installation-images.changes | 8 ++++++++ installation-images.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.350.tar.xz create mode 100644 installation-images-14.351.tar.xz diff --git a/installation-images-14.350.tar.xz b/installation-images-14.350.tar.xz deleted file mode 100644 index bebe2d9..0000000 --- a/installation-images-14.350.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1980a791cb9c26a62ca4d554df5ed82351cfea1bd4e78e6daa6929d44354beb -size 173876 diff --git a/installation-images-14.351.tar.xz b/installation-images-14.351.tar.xz new file mode 100644 index 0000000..638f1cc --- /dev/null +++ b/installation-images-14.351.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7e162ae2d3c3ccfc7e8b33e1e2baef649152babb870eded7e99f0fddbc74d48 +size 173988 diff --git a/installation-images.changes b/installation-images.changes index 118766d..6d91773 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,11 @@ +-------------------------------------------------------------------- +Mon Jan 8 16:56:16 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#224 +- switch to using unified-installer-release +- fix typo: must be sles, not sle +- 14.351 + ------------------------------------------------------------------- Mon Jan 8 17:52:49 CET 2018 - snwint@suse.de diff --git a/installation-images.spec b/installation-images.spec index bb3d647..7596d4b 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -503,7 +503,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.350 +Version: 14.351 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) From 8bb7d253df8240948833b812e480335d9be34747aaf6a5ae11d545bd0b34542a Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 9 Jan 2018 13:42:34 +0000 Subject: [PATCH 4/5] - avoid explicit dependency on python-libstoragemgmt OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1100 --- installation-images.changes | 5 +++++ installation-images.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/installation-images.changes b/installation-images.changes index 6d91773..d00a417 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 9 14:42:09 CET 2018 - snwint@suse.de + +- avoid explicit dependency on python-libstoragemgmt + -------------------------------------------------------------------- Mon Jan 8 16:56:16 UTC 2018 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 7596d4b..83866d5 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -487,7 +487,6 @@ BuildRequires: grub2-arm64-efi # inst-sys module for libstoragemgmt BuildRequires: libstoragemgmt-netapp-plugin BuildRequires: libstoragemgmt-smis-plugin -BuildRequires: python-libstoragemgmt # our images are not reproducible and it's taking time #!BuildIgnore: build-compare From 0f1fd6e03d1e57c74fce5d935e216afccf2bd40ca1d765a110bf2244ee245782 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 9 Jan 2018 13:44:01 +0000 Subject: [PATCH 5/5] - release 14.352 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1101 --- installation-images-14.351.tar.xz | 3 --- installation-images-14.352.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.351.tar.xz create mode 100644 installation-images-14.352.tar.xz diff --git a/installation-images-14.351.tar.xz b/installation-images-14.351.tar.xz deleted file mode 100644 index 638f1cc..0000000 --- a/installation-images-14.351.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7e162ae2d3c3ccfc7e8b33e1e2baef649152babb870eded7e99f0fddbc74d48 -size 173988 diff --git a/installation-images-14.352.tar.xz b/installation-images-14.352.tar.xz new file mode 100644 index 0000000..51bb9a9 --- /dev/null +++ b/installation-images-14.352.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4336064fe38eaa76777882962da888f6d8caac5661186dc0737a1657fab915c +size 173964 diff --git a/installation-images.changes b/installation-images.changes index d00a417..0ab9af1 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Tue Jan 9 13:42:51 UTC 2018 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#226 +- simplify definitions for libstoragemgmt image +- 14.352 + ------------------------------------------------------------------- Tue Jan 9 14:42:09 CET 2018 - snwint@suse.de diff --git a/installation-images.spec b/installation-images.spec index 83866d5..393e7e8 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -502,7 +502,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.351 +Version: 14.352 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)