diff --git a/python-kiwi.changes b/python-kiwi.changes index 8fb1c28..ca15562 100644 --- a/python-kiwi.changes +++ b/python-kiwi.changes @@ -1,6 +1,11 @@ +------------------------------------------------------------------- +Fri Mar 10 17:08:11 CET 2017 - ms@suse.com + +- Add documentation hint for multipython package + ------------------------------------------------------------------- Thu Mar 9 17:21:54 CET 2017 - ms@suse.com - + - Setup package for multipython build Build package for both python2 and python3 diff --git a/python-kiwi.spec b/python-kiwi.spec index 4fdf15f..fb6b766 100644 --- a/python-kiwi.spec +++ b/python-kiwi.spec @@ -16,7 +16,7 @@ # # https://github.com/SUSE/kiwi/issues # -%{?!python2_sitelib:%define python2_sitelib %python_sitelib} +%{!?python2_sitelib:%global python2_sitelib %{python_sitelib}} # translate version id to distribution name as it is used in kiwi %if 0%{?suse_version} @@ -82,6 +82,7 @@ and cloud systems like Xen, KVM, VMware, EC2 and more. %package -n python2-kiwi Summary: KIWI - Appliance Builder Next Generation Group: Development/Languages/Python +Provides: python-kiwi = %{version}-%{release} Provides: kiwi-image:tbz Provides: kiwi-image:docker Provides: kiwi-image:iso @@ -278,6 +279,11 @@ touch %{buildroot}%{_sysconfdir}/alternatives/kiwi ln -s %{_sysconfdir}/alternatives/kiwi \ %{buildroot}%_bindir/kiwi +# alternatives setup for kiwi-ng -> kiwi-ng-py_ver binary +touch %{buildroot}%{_sysconfdir}/alternatives/kiwi-ng +ln -s %{_sysconfdir}/alternatives/kiwi-ng \ + %{buildroot}%_bindir/kiwi-ng + # alternatives setup for kiwicompat -> kiwicompat-py_ver binary touch %{buildroot}%{_sysconfdir}/alternatives/kiwicompat ln -s %{_sysconfdir}/alternatives/kiwicompat \ @@ -297,12 +303,16 @@ done %post %{_sbindir}/update-alternatives \ --install %_bindir/kiwi kiwi %_bindir/kiwi-ng-%{py_ver} 10 +%{_sbindir}/update-alternatives \ + --install %_bindir/kiwi-ng kiwi-ng %_bindir/kiwi-ng-%{py_ver} 10 %{_sbindir}/update-alternatives \ --install %_bindir/kiwicompat kiwicompat %_bindir/kiwicompat-%{py_ver} 10 %preun %{_sbindir}/update-alternatives \ --remove kiwi %_bindir/kiwi +%{_sbindir}/update-alternatives \ + --remove kiwi %_bindir/kiwi-ng %{_sbindir}/update-alternatives \ --remove kiwicompat %_bindir/kiwicompat @@ -324,8 +334,10 @@ fi %{_bindir}/kiwi-ng-2* %{_bindir}/kiwicompat-2* %ghost %{_bindir}/kiwi +%ghost %{_bindir}/kiwi-ng %ghost %{_bindir}/kiwicompat %ghost %_sysconfdir/alternatives/kiwi +%ghost %_sysconfdir/alternatives/kiwi-ng %ghost %_sysconfdir/alternatives/kiwicompat %{python2_sitelib}/* %config %_sysconfdir/bash_completion.d/kiwi-ng-2*.sh @@ -335,8 +347,10 @@ fi %{_bindir}/kiwi-ng-3* %{_bindir}/kiwicompat-3* %ghost %{_bindir}/kiwi +%ghost %{_bindir}/kiwi-ng %ghost %{_bindir}/kiwicompat %ghost %_sysconfdir/alternatives/kiwi +%ghost %_sysconfdir/alternatives/kiwi-ng %ghost %_sysconfdir/alternatives/kiwicompat %{python3_sitelib}/* %config %_sysconfdir/bash_completion.d/kiwi-ng-3*.sh diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz index 564b114..836b43c 100644 --- a/python-kiwi.tar.gz +++ b/python-kiwi.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c49bd1db1c79c01969e92039a1398201d22600969efe8ee3fd0969b90d2d026 -size 2949691 +oid sha256:d77a381ce112d5e9266a3c9ce9b5fd9637587f6c9e230db507bf10e3b9a669c1 +size 2931667