From f4bfe3d3be56023b8de4a650f6dfc877a3d77c4abc1bbdacf3e5947bf899c638 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 15 Sep 2016 15:24:57 +0000 Subject: [PATCH] Accepting request 427970 from home:TheBlackCat:branches:devel:languages:python Fix update-alternatives usage OBS-URL: https://build.opensuse.org/request/show/427970 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-future?expand=0&rev=4 --- python-future.changes | 5 +++++ python-future.spec | 31 ++++++++++++++++--------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/python-future.changes b/python-future.changes index c8b39e7..f93fd4d 100644 --- a/python-future.changes +++ b/python-future.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 15 15:18:21 UTC 2016 - toddrme2178@gmail.com + +- Fix update-alternatives usage. + ------------------------------------------------------------------- Fri Sep 9 03:28:19 UTC 2016 - glin@suse.com diff --git a/python-future.spec b/python-future.spec index f8f3c52..0dbd856 100644 --- a/python-future.spec +++ b/python-future.spec @@ -28,7 +28,7 @@ BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-setuptools 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()")} @@ -51,33 +51,34 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -%fdupes %{buildroot}/%{python_sitelib}/* -mv %{buildroot}%{_bindir}/futurize %{buildroot}%{_bindir}/futurize-2 -mv %{buildroot}%{_bindir}/pasteurize %{buildroot}%{_bindir}/pasteurize-2 -ln -s -f %{_sysconfdir}/alternatives/futurize %{buildroot}%{_bindir}/futurize -ln -s -f %{_sysconfdir}/alternatives/pasteurize %{buildroot}%{_bindir}/pasteurize +# Prepare for update-alternatives usage +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +for p in futurize pasteurize ; do + mv %{buildroot}%{_bindir}/$p %{buildroot}%{_bindir}/$p-%{py_ver} + ln -s -f %{_sysconfdir}/alternatives/$p %{buildroot}%{_bindir}/$p +done + +%fdupes %{buildroot}/%{python_sitelib}/* %post -%_sbindir/update-alternatives --install \ - %{_bindir}/futurize futurize %{_bindir}/futurize-2 15 -%_sbindir/update-alternatives --install \ - %{_bindir}/pasteurize pasteurize %{_bindir}/pasteurize-2 15 +%_sbindir/update-alternatives \ + --install %{_bindir}/futurize futurize %{_bindir}/futurize-%{py_ver} 30 \ + --slave %{_bindir}/pasteurize pasteurize %{_bindir}/pasteurize-%{py_ver} %preun -if [ "$1" = 0 ] ; then - %_sbindir/update-alternatives --remove futurize %{_bindir}/futurize-2 - %_sbindir/update-alternatives --remove pasteurize %{_bindir}/pasteurize-2 +if [ $1 -eq 0 ] ; then + %_sbindir/update-alternatives --remove futurize %{_bindir}/futurize-%{py_ver} fi %files %defattr(-,root,root,-) %doc LICENSE.txt README.rst %{python_sitelib}/* -%{_bindir}/futurize-2 -%{_bindir}/pasteurize-2 %{_bindir}/futurize %{_bindir}/pasteurize +%{_bindir}/futurize-%{py_ver} +%{_bindir}/pasteurize-%{py_ver} %ghost %{_sysconfdir}/alternatives/futurize %ghost %{_sysconfdir}/alternatives/pasteurize