diff --git a/python-tempora.changes b/python-tempora.changes index 8d766ad..b73804c 100644 --- a/python-tempora.changes +++ b/python-tempora.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 1 12:24:10 UTC 2021 - Stefan Schubert - -- Use libalternatives instead of update-alternatives. - ------------------------------------------------------------------- Wed Sep 1 11:24:10 UTC 2021 - John Paul Adrian Glaubitz diff --git a/python-tempora.spec b/python-tempora.spec index 4ca250a..1d0825a 100644 --- a/python-tempora.spec +++ b/python-tempora.spec @@ -16,12 +16,6 @@ # -%if 0%{?suse_version} > 1500 -%bcond_without libalternatives -%else -%bcond_with libalternatives -%endif - %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-tempora @@ -43,12 +37,8 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-jaraco.functools >= 1.20 Requires: python-pytz -%if %{with libalternatives} -Requires: alts -%else Requires(post): update-alternatives Requires(postun):update-alternatives -%endif BuildArch: noarch %python_subpackages @@ -69,47 +59,23 @@ sed -i '/--mypy/d' pytest.ini %install %python_install -%if ! %{with libalternatives} - %python_clone -a %{buildroot}%{_bindir}/calc-prorate -%else - %python_clone %{buildroot}%{_bindir}/calc-prorate - ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/calc-prorate - mkdir -p %{buildroot}%{_datadir}/libalternatives/calc-prorate - %python_expand echo "binary=%{_bindir}/calc-prorate-%{$python_version}" > %{buildroot}%{_datadir}/libalternatives/calc-prorate/10%{$python_version_nodots}.conf -%endif - +%python_clone -a %{buildroot}%{_bindir}/calc-prorate %python_expand %fdupes %{buildroot}%{$python_sitelib} %check sed -i -e 's:--black::' -e 's:--cov::' -e 's/--flake8//g' pytest.ini %pytest -%if %{with libalternatives} -%pre -# removing old update-alternatives entries -if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then - %python_uninstall_alternative calc-prorate -fi -%else %post %python_install_alternative calc-prorate %postun %python_uninstall_alternative calc-prorate -%endif %files %{python_files} %license LICENSE %doc CHANGES.rst README.rst docs/*rst -%if ! 0%{with libalternatives} %python_alternative %{_bindir}/calc-prorate -%else -%dir %{_datadir}/libalternatives -%dir %{_datadir}/libalternatives/calc-prorate -%{_datadir}/libalternatives/calc-prorate/10%python_version_nodots.conf -%{_bindir}/calc-prorate -%{_bindir}/calc-prorate-%python_version -%endif %{python_sitelib}/tempora %{python_sitelib}/tempora-%{version}-py*.egg-info