Todd R ebdd0ba79a Accepting request 325414 from home:bruno_friedmann:branches:devel:languages:python ...

- Make qr binary alternative ready (preparing for python3 packaging)
- man1 & qr alternative -py_ver to avoid conflict with python3
- get ride of previous installed binary and man page
- Fix console_script.py missing +x
- Allow python3 packaging of qrcode

old: devel:languages:python/python-qrcode
new: home:bruno_friedmann:branches:devel:languages:python/python-qrcode rev None
Index: python-qrcode.changes
===================================================================
--- python-qrcode.changes (revision 8)
+++ python-qrcode.changes (revision 5)
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+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  
+
+-------------------------------------------------------------------
 Fri Jun  5 13:11:40 UTC 2015 - hguo@suse.com
 
 - Since factory project cannot make use of download_file service, the package
Index: python-qrcode.spec
===================================================================
--- python-qrcode.spec (revision 8)
+++ python-qrcode.spec (revision 5)
@@ -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

OBS-URL: https://build.opensuse.org/request/show/325414
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-qrcode?expand=0&rev=9

2015-08-23 06:29:52 +00:00

3.2 KiB

Raw Blame History

View Raw