From a574f01dc970218115207ca9241b0b05cb9a193ab5ef10f91085f1571f111462 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 19 Sep 2021 17:32:29 +0000 Subject: [PATCH] Accepting request 920172 from devel:languages:python revert OBS-URL: https://build.opensuse.org/request/show/920172 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-json5?expand=0&rev=10 --- python-json5.changes | 5 ----- python-json5.spec | 37 +------------------------------------ 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/python-json5.changes b/python-json5.changes index efe91e2..16a0abf 100644 --- a/python-json5.changes +++ b/python-json5.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 9 11:01:05 UTC 2021 - Stefan Schubert - -- Use libalternatives instead of update-alternatives. - ------------------------------------------------------------------- Tue Jun 22 08:52:38 UTC 2021 - Paolo Stivanin diff --git a/python-json5.spec b/python-json5.spec index 81d1222..446027e 100644 --- a/python-json5.spec +++ b/python-json5.spec @@ -16,13 +16,6 @@ # -# -%if 0%{?suse_version} > 1500 -%bcond_without libalternatives -%else -%bcond_with libalternatives -%endif - %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-json5 Version: 0.9.6 @@ -37,12 +30,8 @@ BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-setuptools -%if %{with libalternatives} -Requires: alts -%else Requires(post): update-alternatives Requires(postun):update-alternatives -%endif BuildArch: noarch %python_subpackages @@ -65,47 +54,23 @@ slightly more usable as a configuration language: %install %python_install -%if ! %{with libalternatives} - %python_clone -a %{buildroot}%{_bindir}/pyjson5 -%else - %python_clone %{buildroot}%{_bindir}/pyjson5 - ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/pyjson5 - mkdir -p %{buildroot}%{_datadir}/libalternatives/pyjson5 - %python_expand content="binary=%{_bindir}/pyjson5-%{$python_version}" - %python_expand echo -e $content > %{buildroot}%{_datadir}/libalternatives/pyjson5/10%{$python_version_nodots}.conf -%endif +%python_clone -a %{buildroot}%{_bindir}/pyjson5 %python_expand rm -rf %{buildroot}%{$python_sitelib}/tests %python_expand %fdupes %{buildroot}%{$python_sitelib} %check %pytest -%if %{with libalternatives} -%pre -# removing old update-alternatives entries -if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then - %python_uninstall_alternative pyjson5 -fi -%else %post %python_install_alternative pyjson5 %postun %python_uninstall_alternative pyjson5 -%endif %files %{python_files} %doc README.md %license LICENSE -%if ! 0%{with libalternatives} %python_alternative %{_bindir}/pyjson5 -%else -%dir %{_datadir}/libalternatives -%dir %{_datadir}/libalternatives/pyjson5 -%{_datadir}/libalternatives/pyjson5/10%python_version_nodots.conf -%{_bindir}/pyjson5 -%{_bindir}/pyjson5-%python_version -%endif %{python_sitelib}/* %changelog