Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at 2017-07-04 11:55:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/installation-images (Old) and /work/SRC/openSUSE:Factory/.installation-images.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "installation-images" Tue Jul 4 11:55:59 2017 rev:18 rq:507888 version:14.320 Changes: -------- --- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes 2017-06-28 10:33:12.649484041 +0200 +++ /work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes 2017-07-04 11:56:00.957451167 +0200 @@ -1,0 +2,23 @@ +Mon Jul 3 17:17:11 CEST 2017 - snwint@suse.de + +- revert last change: it is vital that CAASP/SLES/SLED builds can all happen + in the same project (sbehlert) + +------------------------------------------------------------------- +Mon Jul 3 13:01:49 CEST 2017 - snwint@suse.de + +- don't build SLED/SLES on CAASP + +------------------------------------------------------------------- +Fri Jun 30 11:33:14 CEST 2017 - snwint@suse.de + +- don't build SLES_SAP on CAASP + +-------------------------------------------------------------------- +Thu Jun 29 09:48:34 UTC 2017 - varkoly@suse.de + +- merge gh#openSUSE/installation-images#189 +- Add new theme SLES_SAP (bsc#1032850) +- 14.320 + +------------------------------------------------------------------- Old: ---- installation-images-14.319.tar.xz New: ---- installation-images-14.320.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.bFvIQf/_old 2017-07-04 11:56:01.581363365 +0200 +++ /var/tmp/diff_new_pack.bFvIQf/_new 2017-07-04 11:56:01.585362803 +0200 @@ -60,6 +60,12 @@ %endif %endif +%if "%flavor" == "SLES_SAP" +%if 0%{?sle_version} && !0%{?is_opensuse} && !0%{?is_susecaasp} && ( "%{_target_cpu}" == "x86_64" || "%{_target_cpu}" == "ppc64le" ) +%define theme SLES_SAP +%endif +%endif + %if "%flavor" == "CAASP" %if 0%{?is_susecaasp} %define theme CAASP @@ -129,6 +135,20 @@ %endif %endif +%if "%theme" == "SLES_SAP" +%define branding_skelcd SLES +%define branding_systemd SLE +%define branding_plymouth SLE +%define branding_grub2 SLE +%define branding_gfxboot SLE +BuildRequires: SLES_SAP-installation-release +%if 0%{?sle_version} != 0150000 +BuildRequires: sles-release-DVD +BuildRequires: sle12-desktop-migration +BuildRequires: sap-installation-wizard +%endif +%endif + %if "%theme" == "CAASP" %define branding_skelcd CAASP %define branding_systemd CAASP @@ -511,7 +531,7 @@ Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.319 +Version: 14.320 Release: 0 Provides: installation-images = %version-%release Source: installation-images-%{version}.tar.xz ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.bFvIQf/_old 2017-07-04 11:56:01.637355486 +0200 +++ /var/tmp/diff_new_pack.bFvIQf/_new 2017-07-04 11:56:01.637355486 +0200 @@ -4,4 +4,5 @@ <package>SLED</package> <package>CAASP</package> <package>Kubic</package> + <package>SLES_SAP</package> </multibuild> ++++++ installation-images-14.319.tar.xz -> installation-images-14.320.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.319/VERSION new/installation-images-14.320/VERSION --- old/installation-images-14.319/VERSION 2017-06-19 17:40:19.000000000 +0200 +++ new/installation-images-14.320/VERSION 2017-06-29 11:48:34.000000000 +0200 @@ -1 +1 @@ -14.319 +14.320 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.319/changelog new/installation-images-14.320/changelog --- old/installation-images-14.319/changelog 2017-06-19 17:40:19.000000000 +0200 +++ new/installation-images-14.320/changelog 2017-06-29 11:48:34.000000000 +0200 @@ -1,3 +1,6 @@ +2017-06-29: 14.320 + - Add new theme SLES_SAP + 2017-06-19: 14.319 - /etc/systemd: keep symlinks instead of files (bsc #1044791) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-14.319/etc/config new/installation-images-14.320/etc/config --- old/installation-images-14.319/etc/config 2017-06-19 17:40:19.000000000 +0200 +++ new/installation-images-14.320/etc/config 2017-06-29 11:48:34.000000000 +0200 @@ -99,6 +99,16 @@ plymouth = SLE systemd = SLE +[Theme SLES_SAP] +image = 600 +release = SLES_SAP-installation +skelcd = sles +skelcd_ctrl = SLES +yast = SLE +gfxboot = SLE +grub2 = SLE +plymouth = SLE +systemd = SLE [Theme SLED] image = 600