From dc03ae275d9640248b46b2b16f8dc1fdbf189215 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Jul 02 2013 18:03:01 +0000 Subject: update to 2.1.fb36-1 Signed-off-by: Andy Grover --- diff --git a/.gitignore b/.gitignore index b1643d0..a7cef1f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /rtslib-fb-2.1.fb33.tar.gz /rtslib-fb-2.1.fb34.tar.gz /rtslib-fb-2.1.fb35.tar.gz +/rtslib-fb-2.1.fb36.tar.gz diff --git a/python-rtslib-fix-tabs.patch b/python-rtslib-fix-tabs.patch deleted file mode 100644 index 9f9fc24..0000000 --- a/python-rtslib-fix-tabs.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 44223d7bd966164387fbaaade7da58fad617f427 -Author: Andy Grover -Date: Fri Jun 7 15:31:34 2013 -0700 - - tabs -> spaces - - Signed-off-by: Andy Grover - -diff --git a/rtslib/tcm.py b/rtslib/tcm.py -index 4152a98..32d53ee 100644 ---- a/rtslib/tcm.py -+++ b/rtslib/tcm.py -@@ -83,8 +83,8 @@ class StorageObject(CFSNode): - if not lines[0].startswith("PR_REG_START:"): - return - -- reservations = [] -- for line in lines: -+ reservations = [] -+ for line in lines: - if line.startswith("PR_REG_START:"): - res_list = [] - elif line.startswith("PR_REG_END:"): -@@ -92,7 +92,7 @@ class StorageObject(CFSNode): - else: - res_list.append(line.strip()) - -- for res in reservations: -+ for res in reservations: - fwrite(self.path + "/pr/res_aptpl_metadata", ",".join(res)) - - @classmethod diff --git a/python-rtslib.spec b/python-rtslib.spec index cb0e357..c09c5f2 100644 --- a/python-rtslib.spec +++ b/python-rtslib.spec @@ -8,11 +8,10 @@ Name: python-rtslib License: AGPLv3 Group: System Environment/Libraries Summary: API for Linux kernel LIO SCSI target -Version: 2.1.fb35 +Version: 2.1.fb36 Release: 1%{?dist} URL: https://fedorahosted.org/targetcli-fb/ Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz -Patch0: %{name}-fix-tabs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel epydoc @@ -46,7 +45,6 @@ API for generic Linux SCSI kernel target. %prep %setup -q -n %{oname}-%{version} -%patch0 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -93,6 +91,10 @@ rm -rf %{buildroot} %doc doc/html %changelog +* Tue Jul 2 2013 Andy Grover - 2.1.fb36-1 +- New upstream version +- Remove fix-tabs.patch + * Fri Jun 7 2013 Andy Grover - 2.1.fb35-1 - New upstream version - add fix-tabs.patch diff --git a/sources b/sources index 67724db..6e79cc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f9f69150b388672b6ab91b9cb04cb9d rtslib-fb-2.1.fb35.tar.gz +20c7ff2c15bdb64f5897fe22804ea242 rtslib-fb-2.1.fb36.tar.gz