diff --git a/_service b/_service index 7441683..3089918 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git python-shaptools - 0.3.13+git.%ct.%h + 0.3.14+git.%ct.%h %%VERSION%% diff --git a/python-shaptools.changes b/python-shaptools.changes index 969d584..8d5f10a 100644 --- a/python-shaptools.changes +++ b/python-shaptools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 21 11:22:48 UTC 2023 - Pablo Suárez Hernández + +- Create version 0.3.14 +- Make shaptools available for venv-salt-minion (bsc#1212695) + ------------------------------------------------------------------- Fri Jan 13 02:13:36 UTC 2023 - Steve Kowalik diff --git a/python-shaptools.spec b/python-shaptools.spec index 5e48b47..c9a13e6 100644 --- a/python-shaptools.spec +++ b/python-shaptools.spec @@ -52,6 +52,17 @@ BuildArch: noarch %description API to expose SAP HANA functionalities +%package -n python3-shaptools-venv-salt-minion +Summary: Shaptools integration with Salt Bundle +Group: Development/Languages/Python +Requires: venv-salt-minion +Requires: python3-shaptools +Supplements: packageand(python3-shaptools:venv-salt-minion) +BuildArch: noarch + +%description -n python3-shaptools-venv-salt-minion +Integration of shaptools library inside the Salt Bundle, aka venv-salt-minion. + %prep %setup -q -n %{name}-%{version} @@ -71,6 +82,29 @@ API to expose SAP HANA functionalities %postun %python_uninstall_alternative shapcli +%post -n python3-shaptools-venv-salt-minion +BUNDLE_SITELIB= +if [ -f /usr/lib/venv-salt-minion/bin/python ] +then + BUNDLE_SITELIB=`/usr/lib/venv-salt-minion/bin/python -c "import sysconfig as s; print(s.get_paths().get('purelib'))"` +fi +if [ ! -z "$BUNDLE_SITELIB" ] && [ -d "%{python_sitelib}/shaptools" ] && [ ! -f "$BUNDLE_SITELIB/shaptools" ] +then + ln -s %{python_sitelib}/shaptools/ $BUNDLE_SITELIB/shaptools +fi + +%postun -n python3-shaptools-venv-salt-minion +BUNDLE_SITELIB= +if [ -f /usr/lib/venv-salt-minion/bin/python ] +then + BUNDLE_SITELIB=`/usr/lib/venv-salt-minion/bin/python -c "import sysconfig as s; print(s.get_paths().get('purelib'))"` +fi +if [ ! -z "$BUNDLE_SITELIB" ] && [ -L "$BUNDLE_SITELIB/shaptools" ] +then + rm $BUNDLE_SITELIB/shaptools +fi + + %if %{with test} %check %pytest tests @@ -86,4 +120,6 @@ API to expose SAP HANA functionalities %{python_sitelib}/* %python_alternative %{_bindir}/shapcli +%files -n python3-shaptools-venv-salt-minion + %changelog diff --git a/shaptools/__init__.py b/shaptools/__init__.py index e92e5d2..17f0367 100644 --- a/shaptools/__init__.py +++ b/shaptools/__init__.py @@ -6,4 +6,4 @@ :since: 2018-11-15 """ -__version__ = "0.3.13" +__version__ = "0.3.14"