From 41e887d39273415cee5d2a389dd8c3e5c9858d0aef03eb737b0ac02dac3bc82a Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 10 May 2017 09:59:20 +0000 Subject: [PATCH 1/8] - don't build Kubic on Leap OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1018 --- installation-images.changes | 5 +++++ installation-images.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/installation-images.changes b/installation-images.changes index 0cd3597..1f91e0d 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 10 11:56:57 CEST 2017 - snwint@suse.de + +- don't build Kubic on Leap + -------------------------------------------------------------------- Fri May 5 13:20:12 UTC 2017 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 000034f..04f5832 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 From d4db30980b09793b8b92d368753b6810bf1239f43c6b13ab14d070f429a355cc Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 10 May 2017 10:00:15 +0000 Subject: [PATCH 2/8] - don't build Kubic on Leap (bsc#1038025) OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1019 --- installation-images.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation-images.changes b/installation-images.changes index 1f91e0d..438f2c7 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed May 10 11:56:57 CEST 2017 - snwint@suse.de -- don't build Kubic on Leap +- don't build Kubic on Leap (bsc#1038025) -------------------------------------------------------------------- Fri May 5 13:20:12 UTC 2017 - wfeldt@opensuse.org From 23b0721d940294f49f6e2da4d9452bf5bc0f79eb4fc1265e2fbd6f8197773acc Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 10 May 2017 10:03:04 +0000 Subject: [PATCH 3/8] - release 14.313 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1020 --- installation-images-14.312.tar.xz | 3 --- installation-images-14.313.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.312.tar.xz create mode 100644 installation-images-14.313.tar.xz 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.313.tar.xz b/installation-images-14.313.tar.xz new file mode 100644 index 0000000..3d592e1 --- /dev/null +++ b/installation-images-14.313.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7e29fa698b9baa025a778a16a354ffb249ff1d077c92723eeef46f587c45526 +size 171652 diff --git a/installation-images.changes b/installation-images.changes index 438f2c7..d60e3f5 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +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 diff --git a/installation-images.spec b/installation-images.spec index 04f5832..fd6112f 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -486,7 +486,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.312 +Version: 14.313 Release: 0 Provides: installation-images = %version-%release Source: installation-images-%{version}.tar.xz From 6cf7b70f9d89bc6f1532ab22c003b96e6870b4cffa02d7b6d51f0d2856f7c32f Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 10 May 2017 13:54:57 +0000 Subject: [PATCH 4/8] - adjust spec file for sle15 (bsc#1038473) OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1021 --- installation-images.changes | 5 +++++ installation-images.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/installation-images.changes b/installation-images.changes index d60e3f5..c55cc79 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/installation-images.spec b/installation-images.spec index fd6112f..72a6f8e 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -96,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 @@ -115,7 +115,7 @@ ExclusiveArch: x86_64 %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 From 01d066712d12a3f46aa5753adc55c06409819e1ff2540c9c5c716c9c39dab642 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 10 May 2017 14:07:34 +0000 Subject: [PATCH 5/8] - release 14.314 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1022 --- installation-images-14.313.tar.xz | 3 --- installation-images-14.314.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.313.tar.xz create mode 100644 installation-images-14.314.tar.xz diff --git a/installation-images-14.313.tar.xz b/installation-images-14.313.tar.xz deleted file mode 100644 index 3d592e1..0000000 --- a/installation-images-14.313.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7e29fa698b9baa025a778a16a354ffb249ff1d077c92723eeef46f587c45526 -size 171652 diff --git a/installation-images-14.314.tar.xz b/installation-images-14.314.tar.xz new file mode 100644 index 0000000..7a39908 --- /dev/null +++ b/installation-images-14.314.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42c319a6b64b8045007f8d299fddd69dc0948d793dc55371effde5b50b24b39a +size 171720 diff --git a/installation-images.changes b/installation-images.changes index c55cc79..fe259dc 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +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 diff --git a/installation-images.spec b/installation-images.spec index 72a6f8e..f0ded3f 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -486,7 +486,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.313 +Version: 14.314 Release: 0 Provides: installation-images = %version-%release Source: installation-images-%{version}.tar.xz From 79f612326d83910a28c46f0e8bd767a62058f0ac4fe9471d2ed6c53bcd60f2b7 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 15 May 2017 10:21:01 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1023 --- installation-images.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation-images.spec b/installation-images.spec index f0ded3f..e3b1052 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -108,7 +108,7 @@ 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 From 1f8c449447604abf284c75d73474ac73711f3491c1336ccdd49bc548ab340260 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 15 May 2017 11:10:37 +0000 Subject: [PATCH 7/8] - release 14.315 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1024 --- installation-images-14.314.tar.xz | 3 --- installation-images-14.315.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.314.tar.xz create mode 100644 installation-images-14.315.tar.xz diff --git a/installation-images-14.314.tar.xz b/installation-images-14.314.tar.xz deleted file mode 100644 index 7a39908..0000000 --- a/installation-images-14.314.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42c319a6b64b8045007f8d299fddd69dc0948d793dc55371effde5b50b24b39a -size 171720 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 fe259dc..040e544 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +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 diff --git a/installation-images.spec b/installation-images.spec index e3b1052..39ad19c 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -486,7 +486,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.314 +Version: 14.315 Release: 0 Provides: installation-images = %version-%release Source: installation-images-%{version}.tar.xz From c62485dbdf7371490fdfc4ff8f922d0752686b818c1d291fa2a32c55329c219a Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 16 May 2017 08:29:40 +0000 Subject: [PATCH 8/8] - require star explicitly OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=1025 --- installation-images.changes | 5 +++++ installation-images.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/installation-images.changes b/installation-images.changes index 040e544..1c63ce1 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/installation-images.spec b/installation-images.spec index 39ad19c..b86ea8b 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -323,6 +323,7 @@ BuildRequires: smp_utils BuildRequires: socat BuildRequires: sqlite3 BuildRequires: squashfs +BuildRequires: star BuildRequires: strace BuildRequires: systemd-sysvinit BuildRequires: tcpd-devel