diff --git a/0001-signed-char.patch b/0001-signed-char.patch new file mode 100644 index 0000000..b75a1b6 --- /dev/null +++ b/0001-signed-char.patch @@ -0,0 +1,21 @@ +commit ed5ff9b9505e50b545e86dfbdd32077f0ddda0cb +Author: Taylor Jakobson +Date: Thu Feb 1 14:44:32 2018 -0600 + + Use signed char instead of char + + Python3 does not have the "character" type, use signed char instead. + +diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py +index 3a2db10..5af448f 100644 +--- a/targetcli/ui_backstore.py ++++ b/targetcli/ui_backstore.py +@@ -536,7 +536,7 @@ class UIBlockBackstore(UIBackstore): + except (OSError, IOError): + raise ExecutionError("Could not open %s" % dev) + # ioctl returns an int. Provision a buffer for it +- buf = array.array('c', [chr(0)] * 4) ++ buf = array.array('b', [0] * 4) + try: + fcntl.ioctl(f, BLKROGET, buf) + except (OSError, IOError): diff --git a/targetcli.spec b/targetcli.spec index e5f0754..1c0b496 100644 --- a/targetcli.spec +++ b/targetcli.spec @@ -5,9 +5,10 @@ License: ASL 2.0 Group: System Environment/Libraries Summary: An administration shell for storage targets Version: 2.1.fb48 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://fedorahosted.org/targetcli-fb/ Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz +Patch0001: 0001-signed-char.patch BuildArch: noarch BuildRequires: python3-devel, python3-setuptools Requires: python3-rtslib, target-restore, python3-configshell, python3-six, python3-dbus, python3-gobject @@ -21,6 +22,7 @@ users will also need to install and use fcoe-utils. %prep %setup -q -n %{oname}-%{version} +%patch1 -p1 %build %{__python3} setup.py build @@ -41,6 +43,9 @@ install -m 644 targetcli.8.gz %{buildroot}%{_mandir}/man8/ %{_mandir}/man8/targetcli.8.gz %changelog +* Tue May 8 2018 Andy Grover - 2.1.fb48-4 +- Add patch 0001-signed-char.patch + * Fri Feb 09 2018 Igor Gnatenko - 2.1.fb48-3 - Escape macros in %%changelog