commit python-qrcode for openSUSE:Factory
Hello community, here is the log from the commit of package python-qrcode for openSUSE:Factory checked in at 2015-09-02 00:35:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-qrcode (Old) and /work/SRC/openSUSE:Factory/.python-qrcode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-qrcode" Changes: -------- --- /work/SRC/openSUSE:Factory/python-qrcode/python-qrcode.changes 2015-06-24 20:46:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-qrcode.new/python-qrcode.changes 2015-09-02 00:35:44.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Aug 22 07:58:58 UTC 2015 - bruno@ioda-net.ch + +- Make qr binary alternative ready (preparing for python3 packaging) +- man1 & qr alternative -py_ver to avoid conflict with python3 +- Fix console_script.py missing +x + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qrcode.spec ++++++ --- /var/tmp/diff_new_pack.OVqZOl/_old 2015-09-02 00:35:44.000000000 +0200 +++ /var/tmp/diff_new_pack.OVqZOl/_new 2015-09-02 00:35:44.000000000 +0200 @@ -26,6 +26,8 @@ Source: http://pypi.python.org/packages/source/q/qrcode/qrcode-%{version}.tar.gz BuildRequires: python-devel BuildRequires: python-setuptools +Requires(post): update-alternatives +Requires(postun): 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()")} @@ -46,11 +48,47 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +# Prepare for update-alternatives usage +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +mv -v %{buildroot}%{_bindir}/qr %{buildroot}%{_bindir}/qr-%{py_ver} +# rename man page too +mv -v %{buildroot}%{_mandir}/man1/qr.1 %{buildroot}%{_mandir}/man1/qr-%{py_ver}.1 + +ln -s -f %{_sysconfdir}/alternatives/qr %{buildroot}%{_bindir}/qr +ln -s -f %{_sysconfdir}/alternatives/qr.1%{?ext_man} %{buildroot}%{_mandir}/man1/qr.1%{?ext_man} + +# create a dummy targets for /etc/alternatives +touch %{buildroot}%{_sysconfdir}/alternatives/qr +touch %{buildroot}%{_sysconfdir}/alternatives/qr.1%{?ext_man} + +# Fix warning about missing +x mode +chmod +x %{buildroot}%{python_sitelib}/qrcode/console_scripts.py + +%pre +# Since /usr/bin/qr 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}/qr ] || rm -f %{_bindir}/qr +[ -h %{_mandir}/man1/qr.1%{?ext_man} ] || rm -f %{_mandir}/man1/qr.1%{?ext_man} + +%post +%_sbindir/update-alternatives \ + --install %{_bindir}/qr qr %{_bindir}/qr-%{py_ver} 30 \ + --slave %{_mandir}/man1/qr.1%{?ext_man} qr.1%{?ext_man} %{_mandir}/man1/qr-%{py_ver}.1%{?ext_man} + +%postun +if [ $1 -eq 0 ] ; then + %_sbindir/update-alternatives --remove qr %{_bindir}/qr-%{py_ver} +fi + %files %defattr(-,root,root,-) %doc CHANGES.rst LICENSE README.rst %{_bindir}/qr +%{_bindir}/qr-%{py_ver} +%{_mandir}/man1/qr.1%{?ext_man} +%{_mandir}/man1/qr-%{py_ver}.1%{?ext_man} +%ghost %{_sysconfdir}/alternatives/qr +%ghost %{_sysconfdir}/alternatives/qr.1%{?ext_man} %{python_sitelib}/* -%doc %{_mandir}/man1/qr.* %changelog
participants (1)
-
root@hilbert.suse.de