From 039e79976cd65db9a7a5d7ed67982ca90668c867 Mon Sep 17 00:00:00 2001
From: Andy Grover <agrover@redhat.com>
Date: Tue, 13 Dec 2011 15:29:15 -0800
Subject: [PATCH] update to 2.0rc1.fb3-1

Signed-off-by: Andy Grover <agrover@redhat.com>
---
 .gitignore        |  1 +
 sources           |  2 +-
 targetcli.service |  3 ++-
 targetcli.spec    | 10 +++++++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 126bf06..a1c2ae4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /targetcli-1.99.2.gitb03ec79.tar.gz
 /v2.0rc1.fb1
 /v2.0rc1.fb2
+/v2.0rc1.fb3
diff --git a/sources b/sources
index 56d1fc2..8d1caf7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a000250bd42fbafaa641b9cd0e7c1663  v2.0rc1.fb2
+81900da121f754db124d1f6d43ed13a6  v2.0rc1.fb3
diff --git a/targetcli.service b/targetcli.service
index 1108bfc..4bf01f3 100644
--- a/targetcli.service
+++ b/targetcli.service
@@ -5,7 +5,8 @@ Requires=sys-kernel-config.mount
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=-/bin/sh /etc/target/all_start.sh
+ExecStart=/usr/bin/targetcli restoreconfig clear_existing=true
+ExecStop=/usr/bin/targetcli clearconfig confirm=true
 SyslogIdentifier=targetcli
 
 [Install]
diff --git a/targetcli.spec b/targetcli.spec
index a34b8f7..6805083 100644
--- a/targetcli.spec
+++ b/targetcli.spec
@@ -4,7 +4,7 @@ Name:           targetcli
 License:        AGPLv3
 Group:          System Environment/Libraries
 Summary:        An administration shell for storage targets
-Version:        2.0rc1.fb2
+Version:        2.0rc1.fb3
 Release:        1%{?dist}
 URL:            https://github.com/agrover/targetcli-fb
 Source:         https://github.com/agrover/%{oname}/tarball/v%{version}
@@ -13,7 +13,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel python-rtslib python-configshell epydoc
 BuildRequires:  systemd-units
-Requires:       python-rtslib >= 2.1.fb1, python-configshell
+Requires:       python-rtslib >= 2.1.fb2, python-configshell
 Requires(post): systemd-units
 
 
@@ -24,7 +24,7 @@ users will also need to install and use fcoe-utils.
 
 
 %prep
-%setup -q -n agrover-%{oname}-091a9a2
+%setup -q -n agrover-%{oname}-8186d2d
 
 %build
 %{__python} setup.py build
@@ -58,6 +58,10 @@ fi
 %{_mandir}/man8/targetcli.8.gz
 
 %changelog
+* Tue Dec 13 2011 Andy Grover <agrover@redhat.com> - 2.0rc1.fb3-1
+- New upstream release
+- Fixup service file for new start/stop targetcli commands
+
 * Tue Dec 6 2011 Andy Grover <agrover@redhat.com> - 2.0rc1.fb2-1
 - New upstream source and release
 - Remove patches: