From 0ae2630a26840442bf52b6bf6d786a1fe6f903e9 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Wed, 10 Oct 2018 10:38:21 -0700 Subject: [PATCH] version 2.1.fb49-1 Signed-off-by: Andy Grover --- .gitignore | 1 + 0001-signed-char.patch | 21 --------------------- sources | 2 +- targetcli.spec | 15 +++++++++------ 4 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 0001-signed-char.patch diff --git a/.gitignore b/.gitignore index fc2b313..cbf37f8 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /targetcli-fb-2.1.fb43.tar.gz /targetcli-fb-2.1.fb46.tar.gz /targetcli-fb-2.1.fb48.tar.gz +/targetcli-fb-2.1.fb49.tar.gz diff --git a/0001-signed-char.patch b/0001-signed-char.patch deleted file mode 100644 index b75a1b6..0000000 --- a/0001-signed-char.patch +++ /dev/null @@ -1,21 +0,0 @@ -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/sources b/sources index b7dfd60..e80d9f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (targetcli-fb-2.1.fb48.tar.gz) = 97351b29d8428e797f0cf7a7bab588f20368121d29fd8ed2afe2bf63aaf10aa7761e355e033772f6cbaf7aec2a1540cffae7dccad872a7e5885f200fa07dd420 +SHA512 (targetcli-fb-2.1.fb49.tar.gz) = 05fb6f638f808bf09089bdd110592b3ed3be49fc70cc1a71680de7bff40dc88425e69e9a99fdfcab712646cf131f78071edae46f214fdfee4b7090f47933c93a diff --git a/targetcli.spec b/targetcli.spec index 7cc040e..c5ad26e 100644 --- a/targetcli.spec +++ b/targetcli.spec @@ -4,11 +4,10 @@ Name: targetcli License: ASL 2.0 Group: System Environment/Libraries Summary: An administration shell for storage targets -Version: 2.1.fb48 -Release: 6%{?dist} -URL: https://fedorahosted.org/targetcli-fb/ -Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz -Patch0001: 0001-signed-char.patch +Version: 2.1.fb49 +Release: 1%{?dist} +URL: https://github.com/open-iscsi/%{oname} +Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz BuildArch: noarch BuildRequires: python3-devel, python3-setuptools Requires: python3-rtslib, target-restore, python3-configshell, python3-six, python3-dbus, python3-gobject @@ -22,7 +21,6 @@ users will also need to install and use fcoe-utils. %prep %setup -q -n %{oname}-%{version} -%patch1 -p1 %build %{__python3} setup.py build @@ -43,6 +41,11 @@ install -m 644 targetcli.8.gz %{buildroot}%{_mandir}/man8/ %{_mandir}/man8/targetcli.8.gz %changelog +* Wed Oct 10 2018 Andy Grover - 2.1.fb49-1 +- New upstream version +- Fix URL so spectool -g works +- Remove patch 0001-signed-char.patch + * Sat Jul 14 2018 Fedora Release Engineering - 2.1.fb48-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild