From 96269f907c87adc60dd997d94b1dfa0643a06562f90dec9626ba417e183b35d0 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 17 Sep 2021 20:45:22 +0000 Subject: [PATCH] Accepting request 919825 from home:schubi2 - Fixed mibcopy installation with alternatives. - Use libalternatives instead of update-alternatives. OBS-URL: https://build.opensuse.org/request/show/919825 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pysmi?expand=0&rev=19 --- python-pysmi.changes | 6 ++++++ python-pysmi.spec | 50 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/python-pysmi.changes b/python-pysmi.changes index aced58e..d11a2b7 100644 --- a/python-pysmi.changes +++ b/python-pysmi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 24 11:59:57 UTC 2021 - schubi + +- Fixed mibcopy installation with alternatives. +- Use libalternatives instead of update-alternatives. + ------------------------------------------------------------------- Mon Oct 14 14:17:08 UTC 2019 - Matej Cepl diff --git a/python-pysmi.spec b/python-pysmi.spec index 1cf8cde..e5852f3 100644 --- a/python-pysmi.spec +++ b/python-pysmi.spec @@ -1,7 +1,7 @@ # # spec file for package python-pysmi # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} > 1500 +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif + %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-pysmi Version: 0.3.4 @@ -28,8 +34,12 @@ BuildRequires: %{python_module ply} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-ply +%if %{with libalternatives} +Requires: alts +%else Requires(post): update-alternatives Requires(postun): update-alternatives +%endif BuildArch: noarch %python_subpackages @@ -49,15 +59,37 @@ Documentation: http://pysmi.sf.net %python_install mv %{buildroot}%{_bindir}/mibdump.py %{buildroot}%{_bindir}/mibdump mv %{buildroot}%{_bindir}/mibcopy.py %{buildroot}%{_bindir}/mibcopy -%python_clone -a %{buildroot}%{_bindir}/mibdump -%python_clone -a %{buildroot}%{_bindir}/mibcopy +%if ! %{with libalternatives} + %python_clone -a %{buildroot}%{_bindir}/mibdump + %python_clone -a %{buildroot}%{_bindir}/mibcopy +%else + %python_clone %{buildroot}%{_bindir}/mibdump + %python_clone %{buildroot}%{_bindir}/mibcopy + ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/mibdump + mkdir -p %{buildroot}%{_datadir}/libalternatives/mibdump + %python_expand echo "binary=%{_bindir}/mibdump-%{$python_version}" > %{buildroot}%{_datadir}/libalternatives/mibdump/10%{$python_version_nodots}.conf + ln -sf %{_bindir}/alts %{buildroot}%{_bindir}/mibcopy + mkdir -p %{buildroot}%{_datadir}/libalternatives/mibcopy + %python_expand echo "binary=%{_bindir}/mibcopy-%{$python_version}" > %{buildroot}%{_datadir}/libalternatives/mibcopy/10%{$python_version_nodots}.conf +%endif %python_expand %fdupes %{buildroot}%{$python_sitelib} +%if %{with libalternatives} +%pre +# removing old update-alternatives entries +if [ "$1" -gt 0 ] && [ -f %{_sbindir}/update-alternatives ] ; then + %python_uninstall_alternative mibdump + %python_uninstall_alternative mibcopy +fi +%else %post %python_install_alternative mibdump +%python_install_alternative mibcopy %postun %python_uninstall_alternative mibdump +%python_uninstall_alternative mibcopy +%endif #%%check #nosetests # cannot be run without pysmnp which needs this package @@ -66,7 +98,19 @@ mv %{buildroot}%{_bindir}/mibcopy.py %{buildroot}%{_bindir}/mibcopy %license LICENSE.rst %doc README.md CHANGES.rst %{python_sitelib}/* +%if ! 0%{with libalternatives} %python_alternative %{_bindir}/mibdump %python_alternative %{_bindir}/mibcopy +%else +%dir %{_datadir}/libalternatives +%dir %{_datadir}/libalternatives/mibdump +%{_datadir}/libalternatives/mibdump/10%python_version_nodots.conf +%{_bindir}/mibdump +%{_bindir}/mibdump-%python_version +%dir %{_datadir}/libalternatives/mibcopy +%{_datadir}/libalternatives/mibcopy/10%python_version_nodots.conf +%{_bindir}/mibcopy +%{_bindir}/mibcopy-%python_version +%endif %changelog