diff --git a/python-jsonpatch.changes b/python-jsonpatch.changes index 6a4d62f..62793f0 100644 --- a/python-jsonpatch.changes +++ b/python-jsonpatch.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Fri Sep 17 21:02:26 UTC 2021 - Matej Cepl - -- Don't use python setup.py test expression. - -------------------------------------------------------------------- -Sun Aug 22 20:36:59 UTC 2021 - Stefan Schubert - -- Use libalternatives instead of update-alternatives. - ------------------------------------------------------------------- Tue May 18 21:54:01 UTC 2021 - Dirk Müller diff --git a/python-jsonpatch.spec b/python-jsonpatch.spec index 4cccc78..7f5eea3 100644 --- a/python-jsonpatch.spec +++ b/python-jsonpatch.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-%{**}} Name: python-jsonpatch Version: 1.32 @@ -36,12 +30,8 @@ BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-jsonpointer >= 1.9 -%if %{with libalternatives} -Requires: alts -%else Requires(post): update-alternatives Requires(preun):update-alternatives -%endif BuildArch: noarch %python_subpackages @@ -58,48 +48,23 @@ Python module to apply JSON-Patches (according to RFC 6902). %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -%if ! %{with libalternatives} - # Prepare for update-alternatives usage - %python_clone -a %{buildroot}%{_bindir}/jsonpatch -%else - %python_clone %{buildroot}%{_bindir}/jsonpatch - ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/jsonpatch - mkdir -p %{buildroot}%{_datadir}/libalternatives/jsonpatch - %python_expand echo "binary=%{_bindir}/jsonpatch-%{$python_version}" > %{buildroot}%{_datadir}/libalternatives/jsonpatch/10%{$python_version_nodots}.conf -%endif - +# Prepare for update-alternatives usage +%python_clone -a %{buildroot}%{_bindir}/jsonpatch rm %{buildroot}%{_bindir}/jsondiff %check -%pyunittest -v tests - -%if %{with libalternatives} -%pre -# removing old update-alternatives entries -if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then - %python_uninstall_alternative jsonpatch -fi -%else +%python_exec tests.py %post %python_install_alternative jsonpatch %preun %python_uninstall_alternative jsonpatch -%endif %files %{python_files} %license COPYING %doc AUTHORS README.md -%if ! 0%{with libalternatives} %python_alternative %{_bindir}/jsonpatch -%else -%dir %{_datadir}/libalternatives -%dir %{_datadir}/libalternatives/jsonpatch -%{_datadir}/libalternatives/jsonpatch/10%python_version_nodots.conf -%{_bindir}/jsonpatch -%{_bindir}/jsonpatch-%python_version -%endif -%{python_sitelib}/jsonpatch* +%{python_sitelib}/* %changelog