From 1170621242e8c4f95fe48fa41bd13052a99702a46bf9f2dcf036e69fb92f6b34 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 16 Jan 2017 16:01:33 +0000 Subject: [PATCH 1/6] - release 14.294 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=965 --- installation-images-14.293.tar.xz | 3 --- installation-images-14.294.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.293.tar.xz create mode 100644 installation-images-14.294.tar.xz diff --git a/installation-images-14.293.tar.xz b/installation-images-14.293.tar.xz deleted file mode 100644 index 305444a..0000000 --- a/installation-images-14.293.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c82d433eda8cd2086d5d2046efac444c25a1064c569124ca9a3806befd593016 -size 168736 diff --git a/installation-images-14.294.tar.xz b/installation-images-14.294.tar.xz new file mode 100644 index 0000000..829bdd0 --- /dev/null +++ b/installation-images-14.294.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e624c25af58c8179990195c9c23ea7937386ff5762dc489b816bb6d5f74750b9 +size 168592 diff --git a/installation-images.changes b/installation-images.changes index ce803b2..1c7be57 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/installation-images.spec b/installation-images.spec index b7270f9..5014e58 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -407,7 +407,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.293 +Version: 14.294 Release: 0 Provides: installation-images-%theme = %version-%release Source: %{name}-%{version}.tar.xz From 68026c9dd0d21a15948f39e515fbf4b7eb26b73cbb75f63d418f4d6a8ad79b97 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 16 Jan 2017 16:11:15 +0000 Subject: [PATCH 2/6] - release 14.295 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=966 --- installation-images-14.294.tar.xz | 3 --- installation-images-14.295.tar.xz | 3 +++ installation-images.changes | 6 ++++++ installation-images.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 installation-images-14.294.tar.xz create mode 100644 installation-images-14.295.tar.xz diff --git a/installation-images-14.294.tar.xz b/installation-images-14.294.tar.xz deleted file mode 100644 index 829bdd0..0000000 --- a/installation-images-14.294.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e624c25af58c8179990195c9c23ea7937386ff5762dc489b816bb6d5f74750b9 -size 168592 diff --git a/installation-images-14.295.tar.xz b/installation-images-14.295.tar.xz new file mode 100644 index 0000000..6f45bbf --- /dev/null +++ b/installation-images-14.295.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec453d46773b50c303c71f1cae5d6fa5df4ce8b37d620e023fd1c34a34837bdd +size 168628 diff --git a/installation-images.changes b/installation-images.changes index 1c7be57..187274c 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/installation-images.spec b/installation-images.spec index 5014e58..4459052 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -407,7 +407,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.294 +Version: 14.295 Release: 0 Provides: installation-images-%theme = %version-%release Source: %{name}-%{version}.tar.xz From 997ce647be0f7255cde95627837ecaaa97e7bdf281d8535aa809c85f49377757 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Mon, 16 Jan 2017 16:43:38 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=967 --- installation-images.spec | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/installation-images.spec b/installation-images.spec index 4459052..44fccd5 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -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 +%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 === From a9a9ed4c410db4661255794733234cc26be2df73927566ebb703b3185c450ee8 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 17 Jan 2017 10:12:04 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=968 --- installation-images.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation-images.spec b/installation-images.spec index 44fccd5..e2df4b5 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -37,7 +37,7 @@ BuildRequires: openSUSE-release BuildRequires: xf86-input-libinput %else -%if 0%{?is_susecasp} +%if 0%{?is_susecaasp} %define theme CAASP %define branding_skelcd CASP %define branding_systemd CAASP From 181eb56a1b12a3814b5cab3121f7a1666d325e8baf72af8f73021e7d9d948dc5 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 19 Jan 2017 11:21:28 +0000 Subject: [PATCH 5/6] - release 14.296 OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=969 --- installation-images-14.295.tar.xz | 3 --- installation-images-14.296.tar.xz | 3 +++ installation-images.changes | 7 +++++++ installation-images.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 installation-images-14.295.tar.xz create mode 100644 installation-images-14.296.tar.xz diff --git a/installation-images-14.295.tar.xz b/installation-images-14.295.tar.xz deleted file mode 100644 index 6f45bbf..0000000 --- a/installation-images-14.295.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec453d46773b50c303c71f1cae5d6fa5df4ce8b37d620e023fd1c34a34837bdd -size 168628 diff --git a/installation-images-14.296.tar.xz b/installation-images-14.296.tar.xz new file mode 100644 index 0000000..6198947 --- /dev/null +++ b/installation-images-14.296.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b784449fa7293eb6d8374d3605893ba0301f182246fa84f1235f4056d19230b +size 168620 diff --git a/installation-images.changes b/installation-images.changes index 187274c..123305c 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/installation-images.spec b/installation-images.spec index e2df4b5..a879ba5 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -1,7 +1,7 @@ # # spec file for package installation-images # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -416,7 +416,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 14.295 +Version: 14.296 Release: 0 Provides: installation-images-%theme = %version-%release Source: %{name}-%{version}.tar.xz From ab153f95385a90a3e00cc260bea1d652a9813e232a6df77961813ceb96e69a8f Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 19 Jan 2017 11:25:12 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/system:install:head/installation-images?expand=0&rev=970 --- installation-images.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/installation-images.spec b/installation-images.spec index a879ba5..9220e33 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -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 @@ -376,7 +376,7 @@ BuildRequires: grub2-x86_64-efi BuildRequires: shim %endif BuildRequires: efibootmgr -BuildRequires: glibc-32bit +#!BuildIgnore: glibc-32bit %endif %ifarch ia64 BuildRequires: acpica @@ -387,7 +387,6 @@ BuildRequires: fpswa BuildRequires: ia32el %endif %ifarch s390x -BuildRequires: glibc-32bit BuildRequires: s390-tools-hmcdrvfs %endif %ifarch %ix86 x86_64