diff --git a/libstoragemgmt.changes b/libstoragemgmt.changes index 970bf19..0090eec 100644 --- a/libstoragemgmt.changes +++ b/libstoragemgmt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 19 05:43:41 UTC 2017 - nwang@suse.com + +- bsc#1073088, change requirements to python3 for SLE15. + ------------------------------------------------------------------- Thu Oct 26 08:57:13 UTC 2017 - mpluskal@suse.com diff --git a/libstoragemgmt.spec b/libstoragemgmt.spec index 7623974..7d33353 100644 --- a/libstoragemgmt.spec +++ b/libstoragemgmt.spec @@ -18,11 +18,19 @@ %define libname %{name}1 %bcond_with test + +%if 0%{?suse_version} >= 1500 || %{with python3} +%define python3 1 +%define python_sitelib %{python3_sitelib} +%else +%define python3 0 +%endif + Name: libstoragemgmt Version: 1.6.0 Release: 0 Summary: Storage array management library -License: LGPL-2.1+ +License: LGPL-2.1+ and GPL-2.0+ Group: System/Libraries Url: https://github.com/libstorage/libstoragemgmt Source0: https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz @@ -30,11 +38,19 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libconfig-devel BuildRequires: pkgconfig -BuildRequires: python-argparse +%if 0%{python3} +BuildRequires: python3-devel +BuildRequires: python3-pyudev +BuildRequires: python3-pywbem +BuildRequires: python3-six +Requires: python3-six +%else BuildRequires: python-devel BuildRequires: python-pyudev BuildRequires: python-pywbem BuildRequires: python-six +Requires: python-six +%endif BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(libxml-2.0) @@ -42,11 +58,14 @@ BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) -Requires: python-%{name} -Requires: python-%{name}-clibs -Requires: python-six +%if 0%{python3} +Requires: python3-%{name} +Requires: python3-%{name}-clibs +%else +Requires: python2-%{name} +Requires: python2-%{name}-clibs +%endif %systemd_requires -%py_requires %if %{with test} BuildRequires: chrpath BuildRequires: libtool @@ -89,36 +108,56 @@ Requires: %{libname} = %{version} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package -n python-%{name} +%if 0%{python3} +%package -n python3-%{name} +%else +%package -n python2-%{name} +%endif Summary: Python client libraries and plug-in support for %{name} Group: System/Libraries Requires: %{name} = %{version} -Requires: python-%{name}-clibs -Requires: python-argparse +%if 0%{python3} +Requires: python3-%{name}-clibs +%else +Requires: python2-%{name}-clibs +%endif BuildArch: noarch -%py_requires -%description -n python-%{name} +%if 0%{python3} +%description -n python3-%{name} +%else +%description -n python2-%{name} +%endif The python-%{name} package contains python client libraries as well as python framework support and open source plug-ins written in python. -%package -n python-%{name}-clibs +%if 0%{python3} +%package -n python3-%{name}-clibs +%else +%package -n python2-%{name}-clibs +%endif Summary: Python C extension for %{name} Group: System/Libraries Requires: %{name} = %{version} -%py_requires -%description -n python-%{name}-clibs +%if 0%{python3} +%description -n python3-%{name}-clibs +%else +%description -n python2-%{name}-clibs +%endif The python-%{name}-clibs package contains python C extentions for %{name}. %package smis-plugin Summary: Files for SMI-S generic array support for %{name} Group: System/Libraries +%if 0%{python3} +Requires: python3-pywbem +%else Requires: python-pywbem +%endif Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} BuildArch: noarch -%py_requires %description smis-plugin The %{name}-smis-plugin package contains plug-in for generic SMI-S @@ -130,7 +169,6 @@ Group: System/Libraries Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} BuildArch: noarch -%py_requires %description netapp-plugin The %{name}-netapp-plugin package contains plug-in for NetApp array @@ -142,7 +180,6 @@ Group: System/Libraries Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} BuildArch: noarch -%py_requires %description targetd-plugin The %{name}-targetd-plugin package contains plug-in for targetd @@ -154,7 +191,6 @@ Group: System/Libraries Requires(post): %{name} = %{version} Requires(postun): %{name} = %{version} BuildArch: noarch -%py_requires %description nstor-plugin The %{name}-nstor-plugin package contains plug-in for NexentaStor @@ -228,6 +264,9 @@ storage. %build %configure \ --disable-static \ +%if 0%{python3} + --with-python3 \ +%endif %if ! %{with test} --without-test %endif @@ -441,11 +480,25 @@ fi %{_libdir}/libstoragemgmt.so %{_libdir}/pkgconfig/libstoragemgmt.pc -%files -n python-%{name} +%if 0%{python3} +%files -n python3-%{name} +%else +%files -n python2-%{name} +%endif %dir %{python_sitelib}/lsm %{python_sitelib}/lsm/external %{python_sitelib}/lsm/_*.py* %{python_sitelib}/lsm/version.* +%if 0%{python3} +%dir %{python_sitelib}/lsm/__pycache__ +%{python_sitelib}/lsm/__pycache__/* +%dir %{python_sitelib}/lsm/plugin/__pycache__ +%{python_sitelib}/lsm/plugin/__pycache__/* +%dir %{python_sitelib}/lsm/plugin/sim/__pycache__ +%{python_sitelib}/lsm/plugin/sim/__pycache__/* +%dir %{python_sitelib}/lsm/lsmcli/__pycache__ +%{python_sitelib}/lsm/lsmcli/__pycache__/* +%endif %dir %{python_sitelib}/lsm/plugin %{python_sitelib}/lsm/plugin/__init__.* %dir %{python_sitelib}/lsm/plugin/sim @@ -458,29 +511,49 @@ fi %files smis-plugin %dir %{python_sitelib}/lsm/plugin/smispy %{python_sitelib}/lsm/plugin/smispy/*.py* +%if 0%{python3} +%dir %{python_sitelib}/lsm/plugin/smispy/__pycache__ +%{python_sitelib}/lsm/plugin/smispy/__pycache__/* +%endif %{_bindir}/smispy_lsmplugin %{_mandir}/man1/smispy_lsmplugin.1%{ext_man} %files netapp-plugin %dir %{python_sitelib}/lsm/plugin/ontap %{python_sitelib}/lsm/plugin/ontap/*.py* +%if 0%{python3} +%dir %{python_sitelib}/lsm/plugin/ontap/__pycache__ +%{python_sitelib}/lsm/plugin/ontap/__pycache__/* +%endif %{_bindir}/ontap_lsmplugin %{_mandir}/man1/ontap_lsmplugin.1%{ext_man} %files targetd-plugin %dir %{python_sitelib}/lsm/plugin/targetd +%if 0%{python3} +%dir %{python_sitelib}/lsm/plugin/targetd/__pycache__ +%{python_sitelib}/lsm/plugin/targetd/__pycache__/* +%endif %{python_sitelib}/lsm/plugin/targetd/*.py* %{_bindir}/targetd_lsmplugin %{_mandir}/man1/targetd_lsmplugin.1%{ext_man} %files nstor-plugin %dir %{python_sitelib}/lsm/plugin/nstor +%if 0%{python3} +%dir %{python_sitelib}/lsm/plugin/nstor/__pycache__ +%{python_sitelib}/lsm/plugin/nstor/__pycache__/* +%endif %{python_sitelib}/lsm/plugin/nstor/*.py* %{_bindir}/nstor_lsmplugin %{_mandir}/man1/nstor_lsmplugin.1%{ext_man} %files megaraid-plugin %dir %{python_sitelib}/lsm/plugin/megaraid +%if 0%{python3} +%dir %{python_sitelib}/lsm/plugin/megaraid/__pycache__ +%{python_sitelib}/lsm/plugin/megaraid/__pycache__/* +%endif %{python_sitelib}/lsm/plugin/megaraid/*.py* %{_bindir}/megaraid_lsmplugin %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/megaraid.conf @@ -488,6 +561,10 @@ fi %files hpsa-plugin %dir %{python_sitelib}/lsm/plugin/hpsa +%if 0%{python3} +%dir %{python_sitelib}/lsm/plugin/hpsa/__pycache__ +%{python_sitelib}/lsm/plugin/hpsa/__pycache__/* +%endif %{python_sitelib}/lsm/plugin/hpsa/*.py* %{_bindir}/hpsa_lsmplugin %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/hpsa.conf @@ -495,6 +572,10 @@ fi %files nfs-plugin %dir %{python_sitelib}/lsm/plugin/nfs +%if 0%{python3} +%dir %{python_sitelib}/lsm/plugin/nfs/__pycache__ +%{python_sitelib}/lsm/plugin/nfs/__pycache__/* +%endif %{python_sitelib}/lsm/plugin/nfs/*.py* %{_bindir}/nfs_lsmplugin %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/nfs.conf @@ -502,6 +583,10 @@ fi %files local-plugin %dir %{python_sitelib}/lsm/plugin/local +%if 0%{python3} +%dir %{python_sitelib}/lsm/plugin/local/__pycache__ +%{python_sitelib}/lsm/plugin/local/__pycache__/* +%endif %{python_sitelib}/lsm/plugin/local/*.py* %{_bindir}/local_lsmplugin %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/local.conf @@ -509,12 +594,20 @@ fi %files arcconf-plugin %dir %{python_sitelib}/lsm/plugin/arcconf +%if 0%{python3} +%dir %{python_sitelib}/lsm/plugin/arcconf/__pycache__ +%{python_sitelib}/lsm/plugin/arcconf/__pycache__/* +%endif %{python_sitelib}/lsm/plugin/arcconf/*.py* %{_bindir}/arcconf_lsmplugin %config(noreplace) %{_sysconfdir}/lsm/pluginconf.d/arcconf.conf %{_mandir}/man1/arcconf_lsmplugin.1%{ext_man} -%files -n python-%{name}-clibs +%if 0%{python3} +%files -n python3-%{name}-clibs +%else +%files -n python2-%{name}-clibs +%endif %{python_sitelib}/lsm/_clib.* %{python_sitelib}/lsm/plugin/nfs/nfs_clib.*