Hello community, here is the log from the commit of package python-rtslib-fb for openSUSE:Factory checked in at 2018-01-10 23:35:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rtslib-fb (Old) and /work/SRC/openSUSE:Factory/.python-rtslib-fb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-rtslib-fb" Wed Jan 10 23:35:45 2018 rev:13 rq:562902 version:2.1.64 Changes: -------- --- /work/SRC/openSUSE:Factory/python-rtslib-fb/python-rtslib-fb.changes 2017-11-30 12:44:51.695074397 +0100 +++ /work/SRC/openSUSE:Factory/.python-rtslib-fb.new/python-rtslib-fb.changes 2018-01-10 23:35:53.174001385 +0100 @@ -1,0 +2,20 @@ +Tue Jan 9 14:37:15 UTC 2018 - [email protected] + +- Fix the conflict to the rtslib properly + +------------------------------------------------------------------- +Wed Jan 3 16:13:57 UTC 2018 - [email protected] + +- Drop the epydoc dependency/documentation generating from the package + to allow building in py3 only enviroment + +------------------------------------------------------------------- +Sun Dec 10 21:14:08 UTC 2017 - [email protected] + +- Converting RPM SPEC file to singlespec format (bsc#1045332), + updating SPEC file only. +- ran 'spec-cleaner' on SPEC file to clean it up. +- Converted from manually-added rtslib-fb-2.1.fb64.tar.gz to + tar_scm service-retrieved rtslib-fb-2.1.fb64.tar.xz + +------------------------------------------------------------------- Old: ---- rtslib-fb-2.1.fb64.tar.gz New: ---- rtslib-fb-2.1.fb64.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rtslib-fb.spec ++++++ --- /var/tmp/diff_new_pack.M6mH9l/_old 2018-01-10 23:35:55.785878835 +0100 +++ /var/tmp/diff_new_pack.M6mH9l/_new 2018-01-10 23:35:55.785878835 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-rtslib-fb # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -18,37 +18,31 @@ %define oname rtslib-fb %define realver 2.1.fb64 -%define dbdir /etc/target - +%define dbdir %{_sysconfdir}/target +%define oldpython python +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-%{oname} Version: 2.1.64 Release: 0%{?dist} -Url: http://github.com/open-iscsi/rtslib-fb.git Summary: API for Linux kernel SCSI target (aka LIO) License: Apache-2.0 Group: Development/Languages/Python -Source: %{oname}-%{realver}.tar.gz -Conflicts: python-rtslib +Url: http://github.com/open-iscsi/rtslib-fb.git +Source: %{oname}-%{realver}.tar.xz +BuildRequires: %{python_module devel} +BuildRequires: %{python_module pyudev} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} BuildRequires: fdupes -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: python-six -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: pyudev - -%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 +BuildRequires: python-rpm-macros +Requires: python-pyudev +Requires(post): update-alternatives +Requires(postun): update-alternatives +Conflicts: %{oldpython}-rtslib BuildArch: noarch -BuildRequires: epydoc -BuildRequires: pyudev +%python_subpackages -%description doc +%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 @@ -57,44 +51,36 @@ %setup -q -n %{oname}-%{realver} %build -%__python setup.py build -%__mkdir_p doc/ -epydoc --no-sourcecode --html -n %{oname} --exclude configobj rtslib_fb/*.py -%__mv html doc/ +%python_build %install -[ "%{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 -%__install -d -m755 %{buildroot}/%{dbdir} -%__install -d -m755 %{buildroot}/%{dbdir}/pr -%__install -d -m755 %{buildroot}/%{dbdir}/alua - -%clean -[ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%{_bindir}/targetctl +%python_install +%python_clone -a %{buildroot}/%{_bindir}/targetctl +%fdupes %{buildroot} +install -d -m755 %{buildroot}%{_mandir}/man5 +install -m644 doc/saveconfig.json.5 %{buildroot}%{_mandir}/man5 +%python_clone -a %{buildroot}%{_mandir}/man5/saveconfig.json.5 +install -d -m755 %{buildroot}%{_mandir}/man8 +install -m644 doc/targetctl.8 %{buildroot}%{_mandir}/man8 +%python_clone -a %{buildroot}%{_mandir}/man8/targetctl.8 +install -d -m755 %{buildroot}/%{dbdir} +install -d -m755 %{buildroot}/%{dbdir}/pr +install -d -m755 %{buildroot}/%{dbdir}/alua + +%post +%python_install_alternative targetctl targetctl.8 saveconfig.json.5 + +%postun +%python_uninstall_alternative targetctl + +%files %{python_files} +%python_alternative %{_bindir}/targetctl %{python_sitelib}/* %doc COPYING README.md -%dir %{_sysconfdir}/target -%doc %{_mandir}/man5/saveconfig.json.5.gz -%doc %{_mandir}/man8/targetctl.8.gz +%doc %python_alternative %{_mandir}/man5/saveconfig.json.5.gz +%doc %python_alternative %{_mandir}/man8/targetctl.8.gz %dir %{dbdir} %dir %{dbdir}/pr %dir %{dbdir}/alua -%files doc -%defattr(-,root,root,-) -%{_defaultdocdir}/python-rtslib-doc-%{version} - %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.M6mH9l/_old 2018-01-10 23:35:55.813877521 +0100 +++ /var/tmp/diff_new_pack.M6mH9l/_new 2018-01-10 23:35:55.817877334 +0100 @@ -4,8 +4,8 @@ <param name="url">https://github.com/open-iscsi/rtslib-fb.git</param> <param name="subdir"></param> <param name="filename">rtslib-fb</param> - <param name="versionformat">2.1.fb63</param> - <param name="revision">v2.1.fb63</param> + <param name="versionformat">2.1.fb64</param> + <param name="revision">v2.1.fb64</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.M6mH9l/_old 2018-01-10 23:35:55.833876584 +0100 +++ /var/tmp/diff_new_pack.M6mH9l/_new 2018-01-10 23:35:55.833876584 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/open-iscsi/rtslib-fb.git</param> - <param name="changesrevision">3637171a68889e340f553943f25d6a5ca20ad1ca</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">737496e24ede21effc807a553cebe88ed5660a2b</param></service></servicedata> \ No newline at end of file
