File project.diff of Package python-kiwi

--- python-kiwi.spec.orig
+++ python-kiwi.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package kiwi
+# spec file for package python-kiwi
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -11,13 +11,11 @@
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via:
-#
-#       https://github.com/SUSE/kiwi/issues
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-# If they aren't provided by a system installed macro, define them
+
 %{!?_defaultdocdir: %global _defaultdocdir %{_datadir}/doc}
 %{!?__python2: %global __python2 /usr/bin/python2}
 %{!?__python3: %global __python3 /usr/bin/python3}
@@ -46,26 +44,27 @@
 
 Name:           python-kiwi
 Version:        9.17.39
-Provides:       kiwi-schema = 6.6
 Release:        0
+Provides:       kiwi-schema = 6.6
 Url:            https://github.com/SUSE/kiwi
 Summary:        KIWI - Appliance Builder Next Generation
 License:        GPL-3.0-or-later
+Group:          %{pygroup}
 %if %{_vendor} == "debbuild"
 # Needed to set Maintainer in output debs
-Packager:       Marcus Schaefer <ms@suse.de>
 %endif
-Group:          %{pygroup}
 Source:         %{name}.tar.gz
 Source1:        %{name}-rpmlintrc
+Patch0:         kiwi-keep-getopt.patch
+Patch1:         kiwi-debug-kversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?fedora} || 0%{?suse_version}
 BuildRequires:  gcc
 BuildRequires:  python3-devel
 %endif
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9
-BuildRequires:  python3-setuptools
 BuildRequires:  fdupes
+BuildRequires:  python3-setuptools
 %endif
 BuildRequires:  python-%{develsuffix}
 BuildRequires:  python-setuptools
@@ -116,18 +115,18 @@ Requires:       grub2-x86_64-efi
 %ifarch %{ix86} x86_64
 Recommends:     gfxboot
 %endif
+Requires:       gptfdisk
 Requires:       qemu-tools
 Requires:       squashfs
-Requires:       gptfdisk
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-Requires:         chkconfig
+Requires:       chkconfig
 Requires(post):   chkconfig
 Requires(postun): chkconfig
+Requires:       dnf
+Requires:       gdisk
 Requires:       qemu-img
 Requires:       squashfs-tools
-Requires:       gdisk
-Requires:       dnf
 Provides:       kiwi-packagemanager:dnf
 Provides:       kiwi-packagemanager:yum
 %endif
@@ -141,22 +140,22 @@ Provides:       kiwi-packagemanager:zypp
 %endif
 %if 0%{?debian} || 0%{?ubuntu}
 Requires:       debootstrap
+Requires:       gdisk
 Requires:       qemu-utils
 Requires:       squashfs-tools
-Requires:       gdisk
 %endif
 Requires:       dosfstools
 Requires:       e2fsprogs
-Requires:       xorriso
 Requires:       grub2
 Requires:       kiwi-man-pages
 Requires:       kiwi-tools
+Requires:       kpartx
 Requires:       lvm2
 Requires:       mtools
 Requires:       parted
-Requires:       kpartx
 Requires:       rsync
 Requires:       tar >= 1.2.7
+Requires:       xorriso
 %if %{_vendor} != "debbuild"
 # Not supported with debbuild yet
 %ifarch %arm aarch64
@@ -201,18 +200,18 @@ Requires:       grub2-x86_64-efi
 %ifarch %{ix86} x86_64
 Recommends:     gfxboot
 %endif
+Requires:       gptfdisk
 Requires:       qemu-tools
 Requires:       squashfs
-Requires:       gptfdisk
 %endif
 %if 0%{?fedora} || 0%{?rhel}
-Requires:         chkconfig
+Requires:       chkconfig
 Requires(post):   chkconfig
 Requires(postun): chkconfig
+Requires:       dnf
+Requires:       gdisk
 Requires:       qemu-img
 Requires:       squashfs-tools
-Requires:       gdisk
-Requires:       dnf
 Provides:       kiwi-packagemanager:dnf
 Provides:       kiwi-packagemanager:yum
 %endif
@@ -226,22 +225,22 @@ Provides:       kiwi-packagemanager:zypp
 %endif
 %if 0%{?debian} || 0%{?ubuntu}
 Requires:       debootstrap
+Requires:       gdisk
 Requires:       qemu-utils
 Requires:       squashfs-tools
-Requires:       gdisk
 %endif
 Requires:       dosfstools
 Requires:       e2fsprogs
-Requires:       xorriso
 Requires:       grub2
 Requires:       kiwi-man-pages
 Requires:       kiwi-tools
+Requires:       kpartx
 Requires:       lvm2
 Requires:       mtools
 Requires:       parted
-Requires:       kpartx
 Requires:       rsync
 Requires:       tar >= 1.2.7
+Requires:       xorriso
 %ifarch %arm aarch64
 Requires:       u-boot-tools
 %endif
@@ -258,7 +257,6 @@ virtualization and cloud systems like Xe
 
 %package -n kiwi-tools
 Summary:        KIWI - Collection of Boot Helper Tools
-License:        GPL-3.0-or-later
 Group:          %{sysgroup}
 
 %description -n kiwi-tools
@@ -271,14 +269,13 @@ outside of the scope of kiwi appliance b
 %ifarch %{ix86} x86_64
 %package -n kiwi-pxeboot
 Summary:        KIWI - PXE boot structure
+Group:          %{sysgroup}
 Requires:       syslinux
 %if 0%{?fedora} || 0%{?rhel}
 Requires(pre):  shadow-utils
 %else
 Requires(pre):  shadow
 %endif
-License:        GPL-3.0-or-later
-Group:          %{sysgroup}
 
 %description -n kiwi-pxeboot
 This package contains the basic PXE directory structure which is
@@ -288,6 +285,7 @@ needed to serve kiwi built images via PX
 
 %package -n dracut-kiwi-lib
 Summary:        KIWI - Dracut kiwi Library
+Group:          %{sysgroup}
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian}
 # Ubuntu 16.04 OBS environments refuse to set up due to
 # initramfs-tools / dracut conflict and initramfs-tools is required
@@ -298,8 +296,8 @@ Requires:       bc
 Requires:       cryptsetup
 %if 0%{?fedora} || 0%{?rhel} || 0%{?ubuntu} >= 1804 || 0%{?debian} >= 9
 Requires:       btrfs-progs
-Requires:       gdisk
 Requires:       dracut-network
+Requires:       gdisk
 %else
 %if 0%{?debian} || 0%{?ubuntu}
 Requires:       btrfs-tools
@@ -310,28 +308,26 @@ Requires:       gptfdisk
 %endif
 %endif
 Requires:       coreutils
+Requires:       curl
+Requires:       dialog
 Requires:       e2fsprogs
 Requires:       grep
 Requires:       lvm2
 Requires:       mdadm
 Requires:       parted
+Requires:       pv
 Requires:       util-linux
 Requires:       xfsprogs
-Requires:       dialog
-Requires:       pv
-Requires:       curl
 %if 0%{?debian} || 0%{?ubuntu}
-Requires:       xz-utils
 Requires:       dmsetup
+Requires:       xz-utils
 %else
-Requires:       xz
 Requires:       device-mapper
+Requires:       xz
 %endif
 %ifarch s390 s390x
 Requires:       s390-tools
 %endif
-License:        GPL-3.0-or-later
-Group:          %{sysgroup}
 
 %description -n dracut-kiwi-lib
 This package contains a collection of methods to provide a library
@@ -339,6 +335,7 @@ for tasks done in other kiwi dracut modu
 
 %package -n dracut-kiwi-oem-repart
 Summary:        KIWI - Dracut module for oem(repart) image type
+Group:          %{sysgroup}
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian}
 # Ubuntu 16.04 OBS environments refuse to set up due to
 # initramfs-tools / dracut conflict and initramfs-tools is required
@@ -346,8 +343,6 @@ Summary:        KIWI - Dracut module for
 BuildRequires:  dracut
 %endif
 Requires:       dracut-kiwi-lib
-License:        GPL-3.0-or-later
-Group:          %{sysgroup}
 
 %description -n dracut-kiwi-oem-repart
 This package contains the kiwi-repart dracut module which is
@@ -356,6 +351,7 @@ geometry according to the setup in the k
 
 %package -n dracut-kiwi-oem-dump
 Summary:        KIWI - Dracut module for oem(install) image type
+Group:          %{sysgroup}
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian}
 # Ubuntu 16.04 OBS environments refuse to set up due to
 # initramfs-tools / dracut conflict and initramfs-tools is required
@@ -371,8 +367,6 @@ Requires:       multipath-tools
 Requires:       device-mapper-multipath
 %endif
 Requires:       gawk
-License:        GPL-3.0-or-later
-Group:          %{sysgroup}
 
 %description -n dracut-kiwi-oem-dump
 This package contains the kiwi-dump dracut module which is
@@ -384,6 +378,7 @@ remote
 
 %package -n dracut-kiwi-live
 Summary:        KIWI - Dracut module for iso(live) image type
+Group:          %{sysgroup}
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian}
 # Ubuntu 16.04 OBS environments refuse to set up due to
 # initramfs-tools / dracut conflict and initramfs-tools is required
@@ -391,9 +386,9 @@ Summary:        KIWI - Dracut module for
 BuildRequires:  dracut
 %endif
 Requires:       dialog
-Requires:       xfsprogs
 Requires:       e2fsprogs
 Requires:       util-linux
+Requires:       xfsprogs
 %if 0%{?debian} || 0%{?ubuntu}
 Requires:       dmsetup
 Requires:       dracut-network
@@ -406,10 +401,8 @@ Requires:       dracut-network
 Requires:       device-mapper
 %endif
 Requires:       dracut
-Requires:       xorriso
 Requires:       parted
-License:        GPL-3.0-or-later
-Group:          %{sysgroup}
+Requires:       xorriso
 
 %description -n dracut-kiwi-live
 This package contains the kiwi-live dracut module which is used
@@ -417,16 +410,15 @@ for booting iso(live) images built with
 
 %package -n dracut-kiwi-overlay
 Summary:        KIWI - Dracut module for vmx(+overlay) image type
+Group:          %{sysgroup}
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version} || 0%{?debian}
 # Ubuntu 16.04 OBS environments refuse to set up due to
 # initramfs-tools / dracut conflict and initramfs-tools is required
 # to set up the build environment...
 BuildRequires:  dracut
 %endif
-Requires:       util-linux
 Requires:       dracut
-License:        GPL-3.0-or-later
-Group:          %{sysgroup}
+Requires:       util-linux
 
 %description -n dracut-kiwi-overlay
 This package contains the kiwi-overlay dracut module which is used
@@ -435,7 +427,6 @@ overlay root filesystem
 
 %package -n kiwi-man-pages
 Summary:        KIWI - manual pages
-License:        GPL-3.0-or-later
 Group:          %{sysgroup}
 
 %description -n kiwi-man-pages
@@ -443,6 +434,9 @@ Provides manual pages to describe the ki
 
 %prep
 %setup -q -n kiwi-%{version}
+%patch0 -p0
+%patch1 -p1
+find -name "*.orig" | xargs -r rm -rfv
 
 # Drop shebang for kiwi/xml_parse.py, as we don't intend to use it
 # as an independent script
openSUSE Build Service is sponsored by