Accepting request 563294 from system:install:head

submitted by snwint via jenkins

OBS-URL: https://build.opensuse.org/request/show/563294
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger 2018-01-10 22:29:24 +00:00 committed by Git OBS Bridge
commit 11a9ba8c10
4 changed files with 44 additions and 47 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9ce79e0564d5107828452351d95b43675ccf2c7f7ac286ddbda34240cced00e6
size 173884

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e4336064fe38eaa76777882962da888f6d8caac5661186dc0737a1657fab915c
size 173964

View File

@ -1,3 +1,35 @@
--------------------------------------------------------------------
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
- avoid explicit dependency on python-libstoragemgmt
--------------------------------------------------------------------
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
- clean up spec file and remove support for pre-sle15 distros
--------------------------------------------------------------------
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

View File

@ -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
@ -521,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
@ -537,7 +502,7 @@ ExcludeArch: %arm
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
Version: 14.349
Version: 14.352
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)