From b9bb263392eff4c86033485b5b0efebd5168ebc8f09e44753a4b693a734278c3 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 15 Aug 2016 18:07:51 +0000 Subject: [PATCH] Accepting request 419501 from home:TheBlackCat:branches:devel:languages:python - Fix update-alternatives implementation. - Split documentation into subpackage. OBS-URL: https://build.opensuse.org/request/show/419501 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyserial?expand=0&rev=15 --- python-pyserial.changes | 6 ++++++ python-pyserial.spec | 26 +++++++++++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/python-pyserial.changes b/python-pyserial.changes index 9d8babe..bfd6113 100644 --- a/python-pyserial.changes +++ b/python-pyserial.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 15 14:51:56 UTC 2016 - toddrme2178@gmail.com + +- Fix update-alternatives implementation. +- Split documentation into subpackage. + ------------------------------------------------------------------- Fri May 20 17:05:24 UTC 2016 - toddrme2178@gmail.com diff --git a/python-pyserial.spec b/python-pyserial.spec index 2ff341e..d0c5339 100644 --- a/python-pyserial.spec +++ b/python-pyserial.spec @@ -39,11 +39,19 @@ BuildArch: noarch Provides: python-serial = %{version} Obsoletes: python-serial < %{version} Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(preun): update-alternatives %description Python Serial Port Extension for Win32, Linux, BSD, Jython, IronPython +%package doc +Summary: Documentation for %{name} +Group: Documentation/Other +Recommends: %{name} = %{version} + +%description doc +Documentation, examples, and help files for %{name}. + %prep %setup -q -n pyserial-%{version} sed -i "s|#\!\/usr\/bin\/env python||" serial/{serialposix,__init__}.py # Fix non-executable scripts @@ -59,25 +67,29 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} mkdir -p %{buildroot}%{_sysconfdir}/alternatives mv %{buildroot}%{_bindir}/miniterm.py %{buildroot}%{_bindir}/miniterm-%{py_ver} ln -s -f %{_sysconfdir}/alternatives/miniterm %{buildroot}%{_bindir}/miniterm -# create a dummy target for /etc/alternatives/miniterm -touch %{buildroot}%{_sysconfdir}/alternatives/miniterm %post -"%_sbindir/update-alternatives" \ +%_sbindir/update-alternatives \ --install %{_bindir}/miniterm miniterm %{_bindir}/miniterm-%{py_ver} 30 -%postun +%preun if [ $1 -eq 0 ] ; then - "%_sbindir/update-alternatives" --remove miniterm %{_bindir}/miniterm-%{py_ver} + %_sbindir/update-alternatives --remove miniterm %{_bindir}/miniterm-%{py_ver} fi %files %defattr(-,root,root,-) -%doc CHANGES.rst LICENSE.txt README.rst examples documentation/_build/* +%doc CHANGES.rst LICENSE.txt README.rst %{_bindir}/miniterm %{_bindir}/miniterm-%{py_ver} %ghost %{_sysconfdir}/alternatives/miniterm %{python_sitelib}/serial/ %{python_sitelib}/pyserial-%{version}-py*.egg-info +%files doc +%defattr(-,root,root,-) +%doc examples/ +%doc documentation/_build/* + + %changelog