- Bump version: 9.20.13 → 9.20.14

- Remmove any Recommends for CentOS7
  This commit fixes the package spec for CentOS 7. In CentOS 7 there is no
  support for weak dependencies. In 9792cea1 a recommended dependency on
  gpg tools was included for all builds and this caused a failure for
  CentOS 7. With this commit, the recommended dependency, is omitted for
  any pre CentOS 8 distro.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Builder/python-kiwi?expand=0&rev=172

PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay')
 arch=(x86_64)
-pkgver=9.20.12
+pkgver=9.20.14
 pkgrel=0
 pkgdesc="KIWI - Appliance Builder Next Generation"
 url="https://github.com/SUSE/kiwi/tarball/master"
@@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep)
 provides=(kiwi-ng kiwi)
 source=("${pkgname}.tar.gz")
 changelog="${pkgname}.changes"
-md5sums=('da0106601a0b35abd8d7f6b5a03752d4')
+md5sums=('c882393cd0db5cb8aa197fc3700604b5')
 
 
 build() {
@@ -22,6 +22,7 @@ build() {
 
 package_python-kiwi(){
   depends=(python-docopt python-future python-lxml python-requests python-setuptools python-six python-pyxattr python-yaml grub qemu squashfs-tools gptfdisk pacman e2fsprogs xfsprogs btrfs-progs libisoburn lvm2 mtools parted multipath-tools rsync tar shadow kiwi-man-pages)
+  optdepends=('gnupg: keyring creation for APT package manager')
   cd kiwi-${pkgver}
   python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
   ln -sr "${pkgdir}/usr/bin/kiwi-ng" "${pkgdir}/usr/bin/kiwi"

python-kiwi.changes

@@ -1,8 +1,197 @@
+-------------------------------------------------------------------
+Fri May 22 13:21:22 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Bump version: 9.20.13 → 9.20.14
+
+-------------------------------------------------------------------
+Fri May 22 11:08:46 CEST 2020 - David Cassany <dcassany@suse.com>
+
+- Remmove any Recommends for CentOS7
+
+  This commit fixes the package spec for CentOS 7. In CentOS 7 there is no
+  support for weak dependencies. In 9792cea1 a recommended dependency on
+  gpg tools was included for all builds and this caused a failure for
+  CentOS 7. With this commit, the recommended dependency, is omitted for
+  any pre CentOS 8 distro.
+
+-------------------------------------------------------------------
+Fri May 22 10:10:08 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Bump version: 9.20.12 → 9.20.13
+
+-------------------------------------------------------------------
+Wed May 20 12:47:47 CEST 2020 - David Cassany <dcassany@suse.com>
+
+- Fix default repositories for APT
+
+  This commit fixes the default repositories configuration for APT.
+
+  Fixes #1439
+
+-------------------------------------------------------------------
+Mon May 18 12:01:50 CEST 2020 - David Cassany <dcassany@suse.com>
+
+- Include recommend for gpg tool
+
+-------------------------------------------------------------------
+Fri May 15 11:40:59 CEST 2020 - David Cassany <dcassany@suse.com>
+
+- Fix signing keys management for APT
+
+  This commit fixes the management of the trusted keyring for apt
+  repositories. It creates a `trusted.gpg` keyring with the provided
+  signing keys so APT can check against that the configured repositories.
+
+  Fixes #1440
+
+-------------------------------------------------------------------
+Thu May 14 13:30:57 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Fixed spec file
+
+  This patch is two fold. First the py2 version of kiwi was
+  dropped since py2 is EOL. To indicate that correctly on the
+  package level python3-kiwi has to obsolete python2-kiwi.
+  The other part of the change is a file conflict of the
+  files:
+
+  etc/bash_completion.d/kiwi-ng.sh
+  /usr/share/doc/packages/python-kiwi/README
+
+  which were provided by the kiwi-man-pages sub-package but
+  were moved to be provided by the main python3-kiwi package
+  now. On update of the package with an older version of
+  kiwi that maintains this files to belong to kiwi-man-pages
+  a file conflict at install time appears. To solve this
+  python3-kiwi now conflicts with kiwi-man-pages < %{version}
+  This Fixes #1413 and Fixes bsc#1168973 and bsc#1156677
+
+-------------------------------------------------------------------
+Wed May 13 12:45:30 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Cleanup use of machine platform name
+
+  in kiwi we handle 32bit x86 architecture names as ix86. This is
+  done by checking i586 and i686 32bit arch names. However those
+  checks are spread over the entire kiwi code base and should be
+  consolidated into one method. The cleanup of those arch name
+  usage fixes an inconsistency between the arch name used in the
+  disk builder and the arch name used in the subformat image
+  formats. This Fixes #1438
+
+-------------------------------------------------------------------
+Wed May 13 12:21:45 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Fixed zypper error code validation
+
+  The error code 127 - command not found, was not treated as
+  an error. This commit adds 127 to be an error condition
+  along with the other 1xx error codes from zypper that are
+  handled as errors. This Fixes #1430
+
+-------------------------------------------------------------------
+Wed May 13 11:34:29 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Added archlinux to build_status helper
+
+  Show the archlinux build results in the build_status
+  helper script
+
+-------------------------------------------------------------------
+Wed May 13 11:30:59 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Added sidebar link to ArchLinux build tests
+
+-------------------------------------------------------------------
+Tue May 12 14:51:36 CEST 2020 - David Cassany <dcassany@suse.com>
+
+- Fix string formatting
+
+  After a flake8 upgrade to v3.8.0 these changes were required to pass
+  the `tox -e check` validation.
+
+-------------------------------------------------------------------
+Tue May 12 13:02:16 CEST 2020 - David Cassany <dcassany@suse.com>
+
+- Add Arch Linux integration tests for x86_64
+
+-------------------------------------------------------------------
+Mon May 11 18:19:25 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Support multiple markup formats
+
+  Allow to read multiple markup formats. Supported are XML
+  and YAML. The parsing and transformation is based on the
+  anymarkup module. The use of anymarkup is optional and
+  implemented as an on demand loading module. If a user
+  uses a yaml config file or a request to convert into
+  yaml is made without an installed anymarkup module an
+  exception is thrown
+
+-------------------------------------------------------------------
+Mon May 11 16:15:16 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Fixed boxbuild documentation
+
+  The command doesn't have to be called as root. Therefore
+  the example should not be used with sudo prefix
+
+-------------------------------------------------------------------
+Mon May 11 15:39:18 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Allow setup of serial line in bootloader
+
+  So far kiwi used a static serial line setup of the console
+  type was configured to use a serial console. However if
+  different parameters are needed there was no way to change
+  the static setup. This commit adds a new bootloader attribute
+  called serial_line which allows to specify the serial line
+  parameters for the grub bootloader e.g
+
+  serial_line="serial --speed=9600 --unit=0 --word=8 --parity=no --stop=1"
+
+  Please note serial_line takes the value as it is given and
+  adds this as a line to the grub configuration or as content
+  to the variable GRUB_SERIAL_COMMAND. No further validation
+  of the information takes place by kiwi. This Fixes #1401
+
+-------------------------------------------------------------------
+Mon May 11 12:32:36 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Support grub timeout_style parameter
+
+  Grub supports a style setting that influences the display of
+  the menu depending on the configured timeout value. With this
+  patch kiwi allows to specify the style via a new bootloader
+  parameter named timeout_style="hidden|countdown". If not set
+  the grub default applies which shows the menu in any case.
+  This Fixes bsc#1165730 and Fixes #1404
+
 -------------------------------------------------------------------
 Fri May 08 16:47:03 CEST 2020 - Marcus Schäfer <ms@suse.de>
 
 - Bump version: 9.20.11 → 9.20.12
 
+-------------------------------------------------------------------
+Fri May 08 13:41:38 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Update build tests to match new schema v7.2
+
+-------------------------------------------------------------------
+Thu May 07 12:17:10 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Refactor setup of bootloader parameters
+
+  The bootloader settings are handled through attributes in the
+  type element. Over the years some attributes were added and
+  there are requests for more settings. Therefore the bootloader
+  setup deservers its own section. With this commit the schema
+  changes from v7.1 to v7.2 and moves bootloader, bootloader_console
+  boottimeout and zipl_targettype into a new bootloader subsection
+  below type. The commit also adds an auto transformation template
+  such that customers don't have to change their image descriptions.
+  This is related to Issue #1401
+
 -------------------------------------------------------------------
 Tue May 05 10:43:52 CEST 2020 - Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
 

python-kiwi.spec

@@ -43,8 +43,8 @@
 %endif
 
 Name:           python-kiwi
-Version:        9.20.12
+Version:        9.20.14
-Provides:       kiwi-schema = 7.1
+Provides:       kiwi-schema = 7.2
 Release:        0
 Url:            https://github.com/OSInside/kiwi
 Summary:        KIWI - Appliance Builder Next Generation
@@ -80,6 +80,9 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
 %package -n python%{python3_pkgversion}-kiwi
 Summary:        KIWI - Appliance Builder Next Generation
 Group:          Development/Languages/Python
+Obsoletes:      python2-kiwi
+Conflicts:      python2-kiwi
+Conflicts:      kiwi-man-pages < %{version}
 %if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} || 0%{?debian} || 0%{?ubuntu}
 Recommends:     jing
 %endif
@@ -122,10 +125,14 @@ Requires:       gdisk
 Requires:       dnf
 Provides:       kiwi-packagemanager:dnf
 Provides:       kiwi-packagemanager:yum
+%if 0%{?fedora} || 0%{?rhel} >= 8
+Recommends:     gnupg2
+%endif
 %endif
 %if 0%{?suse_version}
 # If it's available, let's pull it in
 Recommends:     dnf
+Recommends:     gpg2
 %endif
 %if 0%{?fedora} >= 26 || 0%{?suse_version}
 Requires:       zypper
@@ -136,6 +143,7 @@ Requires:       debootstrap
 Requires:       qemu-utils
 Requires:       squashfs-tools
 Requires:       gdisk
+Recommends:     gnupg
 %endif
 Requires:       dosfstools
 Requires:       e2fsprogs

python-kiwi.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f46024fdd46d436b9d6e13e880008ee882fa994ba090d1d0b6e462b7964601b
+oid sha256:0c9b62f141906c07e06593c582a0dace06020e78e51223227831491e85a9e570
-size 1665144
+size 1671734