From c8fae01a7f0e789f99b81326d7d18fb440f7eaa31292a52f0a867e7dd73d0a90 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 21 Apr 2016 10:30:18 +0000 Subject: [PATCH] Accepting request 391087 from home:lee_duncan - Update to version 2.1.fb60 * no changelog available, but git log shows 59 changes, some trivial OBS-URL: https://build.opensuse.org/request/show/391087 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-rtslib-fb?expand=0&rev=8 --- python-rtslib-fb.changes | 7 ++++ python-rtslib-fb.spec | 68 ++++++++++++++++++++++++++++++--------- rtslib-fb-2.1.51.tar.gz | 3 -- rtslib-fb-2.1.fb60.tar.gz | 3 ++ 4 files changed, 62 insertions(+), 19 deletions(-) delete mode 100644 rtslib-fb-2.1.51.tar.gz create mode 100644 rtslib-fb-2.1.fb60.tar.gz diff --git a/python-rtslib-fb.changes b/python-rtslib-fb.changes index a14a65f..783499c 100644 --- a/python-rtslib-fb.changes +++ b/python-rtslib-fb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 20 16:17:30 UTC 2016 - lduncan@suse.com + +- Update to version 2.1.fb60 + * no changelog available, but git log shows 59 changes, + some trivial + ------------------------------------------------------------------- Tue May 12 14:58:13 UTC 2015 - benoit.monin@gmx.fr diff --git a/python-rtslib-fb.spec b/python-rtslib-fb.spec index dab4c3a..f5ed45a 100644 --- a/python-rtslib-fb.spec +++ b/python-rtslib-fb.spec @@ -1,7 +1,7 @@ # # spec file for package python-rtslib-fb # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,42 +16,78 @@ # -Name: python-rtslib-fb -Version: 2.1.51 -Release: 0 +%define oname rtslib-fb +%define realver 2.1.fb60 + +Name: python-%{oname} +Version: 2.1.60 +Release: 1%{?dist} +Url: http://github.com/agrover/rtslib-fb Summary: API for Linux kernel SCSI target (aka LIO) License: Apache-2.0 Group: Development/Languages/Python -Url: http://github.com/agrover/rtslib-fb -Source: https://pypi.python.org/packages/source/r/rtslib-fb/rtslib-fb-%{version}.tar.gz +Source: %{oname}-%{realver}.tar.gz +Provides: python-rtslib = %{version} +Obsoletes: python-rtslib < %{version} +BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif -# This is the "free branch" of rtslib, they share modules but have differnt code... -Conflicts: python-rtslib %description rtslib-fb is an object-based Python library for configuring the LIO generic SCSI target, present in 3.x Linux kernel versions. rtslib-fb is licensed under the Apache 2.0 license. Contributions are welcome +%package doc +Summary: Documentatoin for Python rtslib-fb +Group: Documentation/HTML +BuildArch: noarch +BuildRequires: epydoc +BuildRequires: pyudev + +%description doc +rtslib-fb is an object-based Python library for configuring the LIO generic +SCSI target, present in 3.x Linux kernel versions. rtslib-fb is licensed under +the Apache 2.0 license. Contributions are welcome + %prep -%setup -q -n rtslib-fb-%{version} +%setup -q -n %{oname}-%{realver} %build -python setup.py build +%__python setup.py build +%__mkdir_p doc/ +epydoc --no-sourcecode --html -n %{oname} --exclude configobj rtslib_fb/*.py +%__mv html doc/ %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +[ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot} +%__python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot} +%fdupes %{buildroot}%{python_sitelib} +%__install -d -m755 %{buildroot}%{_defaultdocdir}/python-rtslib-doc-%{version} +%__cp -r doc/* %{buildroot}%{_defaultdocdir}/python-rtslib-doc-%{version}/ +%fdupes %{buildroot}%{_defaultdocdir} +%__install -d -m755 %{buildroot}%{_sysconfdir}/target +%__install -d -m755 %{buildroot}%{_mandir}/man5 +%__install -m644 doc/saveconfig.json.5 %{buildroot}%{_mandir}/man5 +%__install -d -m755 %{buildroot}%{_mandir}/man8 +%__install -m644 doc/targetctl.8 %{buildroot}%{_mandir}/man8 + +%clean +[ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot} %files %defattr(-,root,root,-) -/usr/bin/targetctl +%{_bindir}/targetctl %{python_sitelib}/* +%doc COPYING README.md +%dir %{_sysconfdir}/target +%doc %{_mandir}/man5/saveconfig.json.5.gz +%doc %{_mandir}/man8/targetctl.8.gz + +%files doc +%defattr(-,root,root,-) +%{_defaultdocdir}/python-rtslib-doc-%{version} %changelog diff --git a/rtslib-fb-2.1.51.tar.gz b/rtslib-fb-2.1.51.tar.gz deleted file mode 100644 index 4742694..0000000 --- a/rtslib-fb-2.1.51.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1902c581d6e04b7813f3cd1b11e2abc796205f646c39571cbbb809229fd5553e -size 28274 diff --git a/rtslib-fb-2.1.fb60.tar.gz b/rtslib-fb-2.1.fb60.tar.gz new file mode 100644 index 0000000..d31833a --- /dev/null +++ b/rtslib-fb-2.1.fb60.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b4e443201b5a03ab5ab4a2ae024d3534505bf5cc02d620cb095db6bb342800d +size 41970