diff --git a/.gitignore b/.gitignore index c0b9a06..4a41cd0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rtslib-fb-2.1.fb50.tar.gz +SOURCES/rtslib-fb-2.1.fb57.tar.gz diff --git a/.python-rtslib.metadata b/.python-rtslib.metadata index 6ae1378..5c116d5 100644 --- a/.python-rtslib.metadata +++ b/.python-rtslib.metadata @@ -1 +1 @@ -ce4da91b618ddae37124d931fb8acdc3a920156c SOURCES/rtslib-fb-2.1.fb50.tar.gz +72f544ff4811022966e1bc6f9c34c51df6153951 SOURCES/rtslib-fb-2.1.fb57.tar.gz diff --git a/SOURCES/0001-Turn-off-unsupported-fabrics.patch b/SOURCES/0001-Turn-off-unsupported-fabrics.patch index b104944..dede061 100644 --- a/SOURCES/0001-Turn-off-unsupported-fabrics.patch +++ b/SOURCES/0001-Turn-off-unsupported-fabrics.patch @@ -1,15 +1,15 @@ -From bca7ea48b5ab9e7ac1d16a5b1e729ab4814539b9 Mon Sep 17 00:00:00 2001 +From fedcdad7023f799461bc86f912741b0b7e844204 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Mon, 7 Oct 2013 15:32:27 -0700 Subject: [PATCH] Turn off unsupported fabrics Signed-off-by: Andy Grover --- - rtslib/fabric.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + rtslib/fabric.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rtslib/fabric.py b/rtslib/fabric.py -index e84e1b9..07acf24 100644 +index eae6325..1ef0b67 100644 --- a/rtslib/fabric.py +++ b/rtslib/fabric.py @@ -441,11 +441,11 @@ fabric_modules = { @@ -27,6 +27,3 @@ index e84e1b9..07acf24 100644 } # --- -1.7.1 - diff --git a/SOURCES/0002-Fix-comparisons-to-None.patch b/SOURCES/0002-Fix-comparisons-to-None.patch new file mode 100644 index 0000000..50a309d --- /dev/null +++ b/SOURCES/0002-Fix-comparisons-to-None.patch @@ -0,0 +1,29 @@ +From 12bc042fd8afb084a8abbdf835df7be040580bfd Mon Sep 17 00:00:00 2001 +From: Andy Grover +Date: Wed, 28 Oct 2015 09:28:29 -0700 +Subject: [PATCH] Fix comparisons to None + +see https://bugzilla.redhat.com/show_bug.cgi?id=1276044 + +Signed-off-by: Andy Grover +--- + rtslib/node.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rtslib/node.py b/rtslib/node.py +index c319a5b..e61249d 100644 +--- a/rtslib/node.py ++++ b/rtslib/node.py +@@ -34,10 +34,10 @@ class CFSNode(object): + self._path = self.configfs_dir + + def __eq__(self, other): +- return self._path == other._path ++ return isinstance(other, self.__class__) and self._path == other._path + + def __ne__(self, other): +- return self._path != other._path ++ return not self.__eq__(other) + + def _get_path(self): + return self._path diff --git a/SPECS/python-rtslib.spec b/SPECS/python-rtslib.spec index 3cca181..54a5b16 100644 --- a/SPECS/python-rtslib.spec +++ b/SPECS/python-rtslib.spec @@ -8,15 +8,16 @@ Name: python-rtslib License: ASL 2.0 Group: System Environment/Libraries Summary: API for Linux kernel LIO SCSI target -Version: 2.1.fb50 -Release: 1%{?dist} +Version: 2.1.fb57 +Release: 3%{?dist} URL: https://fedorahosted.org/targetcli-fb/ Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz Source1: target.service Patch0: 0001-Turn-off-unsupported-fabrics.patch +Patch1: 0002-Fix-comparisons-to-None.patch BuildArch: noarch BuildRequires: python-devel epydoc python-setuptools systemd-units -Requires: python-kmod +Requires: python-kmod python-six Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -51,6 +52,7 @@ API for generic Linux SCSI kernel target. %prep %setup -q -n %{oname}-%{version} %patch0 -p1 +%patch1 -p1 %if 0%{?with_python3} rm -rf %{py3dir} @@ -76,6 +78,9 @@ popd mkdir -p %{buildroot}%{_mandir}/man8/ mkdir -p %{buildroot}%{_mandir}/man5/ mkdir -p %{buildroot}%{_unitdir} +mkdir -p %{buildroot}%{_sysconfdir}/target/backup +mkdir -p %{buildroot}%{_localstatedir}/target/pr +mkdir -p %{buildroot}%{_localstatedir}/target/alua install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/target.service install -m 644 doc/targetctl.8.gz %{buildroot}%{_mandir}/man8/ install -m 644 doc/saveconfig.json.5.gz %{buildroot}%{_mandir}/man5/ @@ -105,6 +110,11 @@ popd %doc COPYING README.md doc/getting_started.md %{_mandir}/man8/targetctl.8.gz %{_mandir}/man5/saveconfig.json.5.gz +%dir %{_sysconfdir}/target +%dir %{_sysconfdir}/target/backup +%dir %{_localstatedir}/target +%dir %{_localstatedir}/target/pr +%dir %{_localstatedir}/target/alua %if 0%{?with_python3} %files -n python3-rtslib @@ -116,6 +126,15 @@ popd %doc doc/html %changelog +* Wed Oct 28 2015 Andy Grover - 2.1.fb57-3 +- Add 0002-Fix-comparisons-to-None.patch for #1276044 + +* Mon Aug 24 2015 Andy Grover - 2.1.fb57-2 +- Include missing paths to resolve #1254670 + +* Tue Jul 14 2015 Andy Grover - 2.1.fb57-1 +- Update to latest Fedora version + * Thu Oct 9 2014 Andy Grover - 2.1.fb50-1 - Update to latest Fedora version