From 7dc4a826a83d7ff3787a8448ecc2aa9222e53fda Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 01 2017 03:40:00 +0000
Subject: import targetcli-2.1.fb46-1.el7


---

diff --git a/.gitignore b/.gitignore
index fa7faa6..849e799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/targetcli-fb-2.1.fb41.tar.gz
+SOURCES/targetcli-fb-2.1.fb46.tar.gz
diff --git a/.targetcli.metadata b/.targetcli.metadata
index e4ed8f1..8fae95d 100644
--- a/.targetcli.metadata
+++ b/.targetcli.metadata
@@ -1 +1 @@
-9d64aa1486b7800cd58f21e9771ff5f398f12cd2 SOURCES/targetcli-fb-2.1.fb41.tar.gz
+cbfc05ef7baac08165fdb17efe26081eb9850363 SOURCES/targetcli-fb-2.1.fb46.tar.gz
diff --git a/SOURCES/targetcli-no-model-alias.patch b/SOURCES/targetcli-no-model-alias.patch
deleted file mode 100644
index 3e34c9c..0000000
--- a/SOURCES/targetcli-no-model-alias.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit e4a45e945aa0e5c2655e9278011b628920f77145
-Author: Andy Grover <agrover@redhat.com>
-Date:   Tue Aug 18 08:33:50 2015 -0700
-
-    targetcli-no-model-alias.patch
-
-diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py
-index e1745c8..c119e70 100644
---- a/targetcli/ui_backstore.py
-+++ b/targetcli/ui_backstore.py
-@@ -208,7 +208,6 @@ class UIPSCSIBackstore(UIBackstore):
- 
-         so = PSCSIStorageObject(name, dev)
-         ui_so = UIPSCSIStorageObject(so, self)
--        self.setup_model_alias(so)
-         self.shell.log.info("Created pscsi storage object %s using %s"
-                             % (name, dev))
-         return self.new_node(ui_so)
-@@ -440,7 +439,6 @@ class UIUserBackedBackstore(UIBackstore):
-         size = human_to_bytes(size)
-         so = UserBackedStorageObject(name, size=size, config=config, level=level)
-         ui_so = UIUserBackedStorageObject(so, self)
--        self.setup_model_alias(so)
-         self.shell.log.info("Created user-backed storage object %s size %d."
-                             % (name, size))
-         return self.new_node(ui_so)
diff --git a/SOURCES/targetcli-no-userbackstores.patch b/SOURCES/targetcli-no-userbackstores.patch
deleted file mode 100644
index 5537052..0000000
--- a/SOURCES/targetcli-no-userbackstores.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py
-index e8bf06f..e1745c8 100644
---- a/targetcli/ui_backstore.py
-+++ b/targetcli/ui_backstore.py
-@@ -109,7 +109,6 @@ class UIBackstores(UINode):
-         UIRDMCPBackstore(self)
-         UIFileIOBackstore(self)
-         UIBlockBackstore(self)
--        UIUserBackedBackstore(self)
- 
- 
- class UIBackstore(UINode):
diff --git a/SPECS/targetcli.spec b/SPECS/targetcli.spec
index 77402e2..5ec751c 100644
--- a/SPECS/targetcli.spec
+++ b/SPECS/targetcli.spec
@@ -4,12 +4,10 @@ Name:           targetcli
 License:        ASL 2.0
 Group:          System Environment/Libraries
 Summary:        An administration shell for storage targets
-Version:        2.1.fb41
-Release:        3%{?dist}
+Version:        2.1.fb46
+Release:        1%{?dist}
 URL:            https://fedorahosted.org/targetcli-fb/
 Source:         https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz
-Patch0:         targetcli-no-userbackstores.patch
-Patch1:         targetcli-no-model-alias.patch
 BuildArch:      noarch
 BuildRequires:  python-devel python-setuptools
 Requires:       python-rtslib >= 2.1.fb41, python-configshell, python-ethtool
@@ -23,8 +21,6 @@ users will also need to install and use fcoe-utils.
 
 %prep
 %setup -q -n %{oname}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -45,6 +41,11 @@ install -m 644 targetcli.8.gz %{buildroot}%{_mandir}/man8/
 %{_mandir}/man8/targetcli.8.gz
 
 %changelog
+* Thu Mar 2 2017 Andy Grover <agrover@redhat.com> - 2.1.fb46-1
+- New upstream version
+- Drop no-model-alias.patch
+- Drop no-userbackstores.patch
+
 * Tue Aug 18 2015 Andy Grover <agrover@redhat.com> - 2.1.fb41-3
 - add no-model-alias.patch, LIO no longer supports for pscsi