diff --git a/installation-images-14.312.tar.xz b/installation-images-14.312.tar.xz deleted file mode 100644 index c4c4875..0000000 --- a/installation-images-14.312.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec89772b9e37e3d8bc523168eb8850cd7ae3ec1288ea8fbc9679c14f2b390dde -size 171664 diff --git a/installation-images-14.315.tar.xz b/installation-images-14.315.tar.xz new file mode 100644 index 0000000..2c71c7b --- /dev/null +++ b/installation-images-14.315.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa1257be6dff257d89579ee13caa7e2b7c08792f15ea36354bdc7abd91219e7e +size 171744 diff --git a/installation-images.changes b/installation-images.changes index 0cd3597..1c63ce1 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Tue May 16 10:28:55 CEST 2017 - snwint@suse.de + +- require star explicitly + +-------------------------------------------------------------------- +Fri May 12 12:44:42 UTC 2017 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#184 +- build 'real' SLED theme (bsc#1038838) +- 14.315 + +-------------------------------------------------------------------- +Wed May 10 14:05:24 UTC 2017 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#183 +- anticipate openssl repackaging +- 14.314 + +------------------------------------------------------------------- +Wed May 10 15:53:56 CEST 2017 - snwint@suse.de + +- adjust spec file for sle15 (bsc#1038473) + +-------------------------------------------------------------------- +Wed May 10 09:59:33 UTC 2017 - jslaby@suse.cz + +- merge gh#openSUSE/installation-images#180 +- etc: update module.config to match 4.11 +- 14.313 + +------------------------------------------------------------------- +Wed May 10 11:56:57 CEST 2017 - snwint@suse.de + +- don't build Kubic on Leap (bsc#1038025) + -------------------------------------------------------------------- Fri May 5 13:20:12 UTC 2017 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 000034f..b86ea8b 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -36,6 +36,10 @@ ExclusiveArch: do_not_build # === sort out branding === %if 0%{?is_opensuse} %if "%flavor" == "Kubic" +%if 0%{?sle_version} +# don't build on Leap for now +ExclusiveArch: do_not_build +%endif %define theme Kubic %define product_nameX %{theme}-%{_target_cpu} %define branding_skelcd CAASP @@ -92,7 +96,7 @@ ExclusiveArch: do_not_build %define branding_gfxboot SLE BuildRequires: sles-release BuildRequires: sles-release-DVD -%if 0%{?sle_version} != 0130000 +%if 0%{?sle_version} != 0150000 BuildRequires: sle12-desktop-migration %ifarch x86_64 ppc64le BuildRequires: sap-installation-wizard @@ -104,14 +108,14 @@ BuildRequires: sap-installation-wizard ExclusiveArch: x86_64 %define theme SLED %define product_nameX %{theme}-%{_target_cpu} -%define branding_skelcd SLES +%define branding_skelcd SLED %define branding_systemd SLE %define branding_plymouth SLE %define branding_grub2 SLE %define branding_gfxboot SLE BuildRequires: sled-release BuildRequires: sled-release-DVD -%if 0%{?sle_version} != 0130000 +%if 0%{?sle_version} != 0150000 BuildRequires: sle12-desktop-migration %endif %endif @@ -319,6 +323,7 @@ BuildRequires: smp_utils BuildRequires: socat BuildRequires: sqlite3 BuildRequires: squashfs +BuildRequires: star BuildRequires: strace BuildRequires: systemd-sysvinit BuildRequires: tcpd-devel @@ -482,7 +487,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.312 +Version: 14.315 Release: 0 Provides: installation-images = %version-%release Source: installation-images-%{version}.tar.xz