Accepting request 451364 from system:install:head
submitted by snwint via jenkins OBS-URL: https://build.opensuse.org/request/show/451364 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/installation-images?expand=0&rev=4
This commit is contained in:
commit
3e6434ac50
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c82d433eda8cd2086d5d2046efac444c25a1064c569124ca9a3806befd593016
|
||||
size 168736
|
3
installation-images-14.296.tar.xz
Normal file
3
installation-images-14.296.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0b784449fa7293eb6d8374d3605893ba0301f182246fa84f1235f4056d19230b
|
||||
size 168620
|
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 19 11:28:37 UTC 2017 - snwint@suse.com
|
||||
|
||||
- remove xf86-video-vmware (bsc#1020649)
|
||||
- drop glibc-32bit dependencies
|
||||
- 14.296
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 16 16:15:44 UTC 2017 - snwint@suse.com
|
||||
|
||||
- rename remaining bits from CASP to CAASP
|
||||
- 14.295
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 16 16:05:46 UTC 2017 - snwint@suse.com
|
||||
|
||||
- use TEST_ARCH also in mlist2 script
|
||||
- sanitize s390x module config
|
||||
- 14.294
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 13 15:02:47 UTC 2017 - snwint@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package installation-images
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 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
|
||||
@ -29,22 +29,31 @@
|
||||
# === sort out branding ===
|
||||
%if 0%{?is_opensuse}
|
||||
%define theme openSUSE
|
||||
%define branding openSUSE
|
||||
%define branding2 openSUSE
|
||||
%define branding_skelcd openSUSE
|
||||
%define branding_systemd openSUSE
|
||||
%define branding_plymouth openSUSE
|
||||
%define branding_grub2 openSUSE
|
||||
%define branding_gfxboot openSUSE
|
||||
BuildRequires: openSUSE-release
|
||||
BuildRequires: xf86-input-libinput
|
||||
%else
|
||||
%if 0%{?is_susecasp}
|
||||
%define theme CASP
|
||||
%define branding SLE
|
||||
%define branding2 CASP
|
||||
%if 0%{?is_susecaasp}
|
||||
%define theme CAASP
|
||||
%define branding_skelcd CASP
|
||||
%define branding_systemd CAASP
|
||||
%define branding_plymouth SLE
|
||||
%define branding_grub2 SLE
|
||||
%define branding_gfxboot SLE
|
||||
%define config_bootmenu_no_upgrade 1
|
||||
BuildRequires: caasp-release
|
||||
BuildRequires: caasp-release-DVD
|
||||
%else
|
||||
%define theme SLES
|
||||
%define branding SLE
|
||||
%define branding2 SLES
|
||||
%define branding_skelcd SLES
|
||||
%define branding_systemd SLE
|
||||
%define branding_plymouth SLE
|
||||
%define branding_grub2 SLE
|
||||
%define branding_gfxboot SLE
|
||||
BuildRequires: sle12-desktop-migration
|
||||
BuildRequires: sles-release
|
||||
%ifarch x86_64 ppc64le
|
||||
@ -53,16 +62,16 @@ BuildRequires: sap-installation-wizard
|
||||
%endif
|
||||
%endif
|
||||
|
||||
BuildRequires: skelcd-control-%branding2
|
||||
BuildRequires: systemd-presets-branding-%branding
|
||||
BuildRequires: skelcd-control-%branding_skelcd
|
||||
BuildRequires: systemd-presets-branding-%branding_systemd
|
||||
%if %with_plymouth
|
||||
BuildRequires: plymouth-branding-%branding
|
||||
BuildRequires: plymouth-branding-%branding_plymouth
|
||||
%endif
|
||||
%ifarch %ix86 x86_64
|
||||
BuildRequires: gfxboot-branding-%branding
|
||||
BuildRequires: gfxboot-branding-%branding_gfxboot
|
||||
%endif
|
||||
%ifarch %ix86 x86_64 aarch64
|
||||
BuildRequires: grub2-branding-%branding
|
||||
BuildRequires: grub2-branding-%branding_grub2
|
||||
%endif
|
||||
# === branding end ===
|
||||
|
||||
@ -367,7 +376,7 @@ BuildRequires: grub2-x86_64-efi
|
||||
BuildRequires: shim
|
||||
%endif
|
||||
BuildRequires: efibootmgr
|
||||
BuildRequires: glibc-32bit
|
||||
#!BuildIgnore: glibc-32bit
|
||||
%endif
|
||||
%ifarch ia64
|
||||
BuildRequires: acpica
|
||||
@ -378,7 +387,6 @@ BuildRequires: fpswa
|
||||
BuildRequires: ia32el
|
||||
%endif
|
||||
%ifarch s390x
|
||||
BuildRequires: glibc-32bit
|
||||
BuildRequires: s390-tools-hmcdrvfs
|
||||
%endif
|
||||
%ifarch %ix86 x86_64
|
||||
@ -407,7 +415,7 @@ ExcludeArch: %arm
|
||||
Summary: Installation Image Files for %theme
|
||||
License: GPL-2.0+
|
||||
Group: Metapackages
|
||||
Version: 14.293
|
||||
Version: 14.296
|
||||
Release: 0
|
||||
Provides: installation-images-%theme = %version-%release
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
|
Loading…
x
Reference in New Issue
Block a user