From b44a00205c494bc8ad10694f0b334de9afb3495126cd19d8e74d6c37941451c9 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 19 Sep 2021 17:25:22 +0000 Subject: [PATCH] Accepting request 920168 from devel:languages:python revert OBS-URL: https://build.opensuse.org/request/show/920168 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pysmi?expand=0&rev=20 --- python-pysmi.changes | 6 ------ python-pysmi.spec | 50 +++----------------------------------------- 2 files changed, 3 insertions(+), 53 deletions(-) diff --git a/python-pysmi.changes b/python-pysmi.changes index d11a2b7..aced58e 100644 --- a/python-pysmi.changes +++ b/python-pysmi.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -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 e5852f3..1cf8cde 100644 --- a/python-pysmi.spec +++ b/python-pysmi.spec @@ -1,7 +1,7 @@ # # spec file for package python-pysmi # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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-pysmi Version: 0.3.4 @@ -34,12 +28,8 @@ 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 @@ -59,37 +49,15 @@ Documentation: http://pysmi.sf.net %python_install mv %{buildroot}%{_bindir}/mibdump.py %{buildroot}%{_bindir}/mibdump mv %{buildroot}%{_bindir}/mibcopy.py %{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_clone -a %{buildroot}%{_bindir}/mibdump +%python_clone -a %{buildroot}%{_bindir}/mibcopy %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 @@ -98,19 +66,7 @@ fi %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