Hello community, here is the log from the commit of package nvmetcli for openSUSE:Factory checked in at 2018-04-11 13:58:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nvmetcli (Old) and /work/SRC/openSUSE:Factory/.nvmetcli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nvmetcli" Wed Apr 11 13:58:40 2018 rev:8 rq:594772 version:0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/nvmetcli/nvmetcli.changes 2018-01-24 15:31:03.368813854 +0100 +++ /work/SRC/openSUSE:Factory/.nvmetcli.new/nvmetcli.changes 2018-04-11 14:00:37.893752294 +0200 @@ -1,0 +2,10 @@ +Sun Apr 8 20:36:58 UTC 2018 - [email protected] + +- Convert to Python3-only siglespec (bsc#1082208) + * Update the SPEC file, using singlespec format, but + telling the macros to ignore Python2 + * Tell the scripts to use Python3 instead of python, + adding patch: + - nvmetcli-update-python-to-python3.patch + +------------------------------------------------------------------- New: ---- nvmetcli-update-python-to-python3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nvmetcli.spec ++++++ --- /var/tmp/diff_new_pack.eZ03v3/_old 2018-04-11 14:00:39.621689832 +0200 +++ /var/tmp/diff_new_pack.eZ03v3/_new 2018-04-11 14:00:39.625689687 +0200 @@ -16,6 +16,10 @@ # +# python2 version of this no longer needed +%define skip_python2 1 + +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: nvmetcli Version: 0.6 Release: 1%{?dist} @@ -24,8 +28,10 @@ Group: System/Management Url: http://git.infradead.org/users/hch/nvmetcli.git Source: nvmetcli-v%{version}.tar.gz -BuildRequires: python-devel -BuildRequires: python-setuptools +Patch1: %{name}-update-python-to-python3.patch +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: python-rpm-macros Requires: python-configshell-fb Requires: python-kmod Requires(post): systemd @@ -34,6 +40,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +%python_subpackages + %description This package contains the command line interface to the NVMe over Fabrics target in the Linux kernel. It allows configuring the NVMe @@ -42,12 +50,13 @@ %prep %setup -q -n nvmetcli-v%{version} +%patch1 -p1 %build -python setup.py build +%python_build %install -python setup.py install --skip-build --root=%{buildroot} --prefix=usr +%python_install mkdir -p %{buildroot}%{_sysconfdir}/nvmet mkdir -p %{buildroot}%{_prefix}/sbin install -m 755 nvmetcli %{buildroot}%{_sbindir}/nvmetcli ++++++ nvmetcli-update-python-to-python3.patch ++++++ From: Lee Duncan <[email protected]> Date: Sun Apr 8 13:35:35 PDT 2018 Subject: [PATCH] use python3 instead of python For ensuring this package uses python3 instead of "python", it is better to patch the two places where this is needed, rather than try to get the SPEC file RPM macros to do the work, without munging the package name. --- diff -aurp nvmetcli-v0.6.orig/nvmetcli nvmetcli-v0.6/nvmetcli --- nvmetcli-v0.6.orig/nvmetcli 2018-01-22 10:45:05.000000000 -0800 +++ nvmetcli-v0.6/nvmetcli 2018-03-30 12:20:36.875255323 -0700 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 ''' Frontend to access to the NVMe target configfs hierarchy diff -aurp nvmetcli-v0.6.orig/setup.py nvmetcli-v0.6/setup.py --- nvmetcli-v0.6.orig/setup.py 2018-01-22 10:45:05.000000000 -0800 +++ nvmetcli-v0.6/setup.py 2018-03-30 12:20:30.215047092 -0700 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 ''' This file is part of ConfigShell. Copyright (c) 2011-2013 by Datera, Inc
