From 06da28c8a9ee6bd1fe82ef6fdab8d83d1fa5988eebe09f1593396048516d6f92 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 15 Aug 2016 16:00:19 +0000 Subject: [PATCH] Accepting request 419469 from home:TheBlackCat:branches:devel:languages:python Fix update-alternatives implementation. OBS-URL: https://build.opensuse.org/request/show/419469 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-zope.testrunner?expand=0&rev=14 --- python-zope.testrunner.changes | 5 +++++ python-zope.testrunner.spec | 16 +++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/python-zope.testrunner.changes b/python-zope.testrunner.changes index d4bfb09..ec16d03 100644 --- a/python-zope.testrunner.changes +++ b/python-zope.testrunner.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 15 14:51:56 UTC 2016 - toddrme2178@gmail.com + +- Fix update-alternatives implementation. + ------------------------------------------------------------------- Fri May 15 13:47:39 UTC 2015 - benoit.monin@gmx.fr diff --git a/python-zope.testrunner.spec b/python-zope.testrunner.spec index 889c029..154fdc9 100644 --- a/python-zope.testrunner.spec +++ b/python-zope.testrunner.spec @@ -40,7 +40,7 @@ Requires: python-six Requires: python-zope.exceptions Requires: python-zope.interface Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(preun): update-alternatives BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} @@ -62,7 +62,6 @@ python setup.py build python setup.py install --prefix=%{_prefix} --root=%{buildroot} # for update-alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives -touch %{buildroot}%{_sysconfdir}/alternatives/zope-testrunner ln -s %{_sysconfdir}/alternatives/zope-testrunner %{buildroot}%{_bindir}/zope-testrunner # Remove duplicate files %fdupes -s %{buildroot}%{python_sitelib} @@ -71,25 +70,20 @@ ln -s %{_sysconfdir}/alternatives/zope-testrunner %{buildroot}%{_bindir}/zope-te #%%check #python setup.py test -%pre -# Since /usr/bin/zope-testrunner became ghosted to be used with update-alternatives, we have to get rid -# of the old binary resulting from the non-update-alternativies-ified package: -[ -h %{_bindir}/zope-testrunner ] || rm -f %{_bindir}/zope-testrunner - %post -update-alternatives --install %{_bindir}/zope-testrunner zope-testrunner %{_bindir}/zope-testrunner-%{py_ver} 20 +%_sbindir/update-alternatives --install %{_bindir}/zope-testrunner zope-testrunner %{_bindir}/zope-testrunner-%{py_ver} 20 -%postun +%preun if [ $1 -eq 0 ] ; then - update-alternatives --remove zope-testrunner %{_bindir}/zope-testrunner-%{py_ver} + %_sbindir/update-alternatives --remove zope-testrunner %{_bindir}/zope-testrunner-%{py_ver} fi %files %defattr(-,root,root,-) %doc LICENSE.rst README.rst -%ghost %{_sysconfdir}/alternatives/zope-testrunner %{_bindir}/zope-testrunner %{_bindir}/zope-testrunner-%{py_ver} +%ghost %{_sysconfdir}/alternatives/zope-testrunner %{python_sitelib}/* %changelog