Hello community,
here is the log from the commit of package python-docutils for openSUSE:Factory
checked in at 2013-09-17 16:18:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-docutils (Old)
and /work/SRC/openSUSE:Factory/.python-docutils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-docutils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-docutils/python-docutils.changes
2013-07-04 10:13:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-docutils.new/python-docutils.changes
2013-09-17 16:25:46.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Sep 16 12:09:22 UTC 2013 - tchva...@suse.com
+
+- Fix the symlink creation.
+
+-------------------------------------------------------------------
+Mon Sep 16 10:32:48 UTC 2013 - tchva...@suse.com
+
+- Drop r7486-python33-compat.patch as it is not needed.
+
+-------------------------------------------------------------------
+Mon Sep 16 10:31:09 UTC 2013 - tchva...@suse.com
+
+- Use update-alternatives to allow switching between py2 and py3
+ version of doctool binaries.
+
+-------------------------------------------------------------------
Old:
----
r7486-python33-compat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-docutils.spec ++++++
--- /var/tmp/diff_new_pack.9KJRu8/_old 2013-09-17 16:25:46.000000000 +0200
+++ /var/tmp/diff_new_pack.9KJRu8/_new 2013-09-17 16:25:46.000000000 +0200
@@ -37,6 +37,8 @@
%else
BuildArch: noarch
%endif
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
%description
Docutils is a modular system for processing documentation into useful formats,
@@ -47,22 +49,64 @@
%setup -n docutils-%{version}
%patch0
# Remove useless ".py" ending from executables:
-for i in tools/rst*; do mv "$i" "${i/.py}"; done
-sed -i "s|'tools/\(rst.*\)\.py'|'tools/\1'|" setup.py
+for i in tools/rst*; do mv "$i" "${i/.py}-%{py_ver}"; done
+sed -i "s|'tools/\(rst.*\)\.py'|'tools/\1-%{py_ver}'|" setup.py
%build
python setup.py build
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+binaries="rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml
rst2s5 rst2xetex rst2xml rstpep2html"
+for i in $binaries; do
+ ln -s %{_bindir}/${i}-%{py_ver} %{buildroot}%{_bindir}/${i}
+done
%check
nosetests
+%pre
+# Since binaries 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.
+binaries="rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml
rst2s5 rst2xetex rst2xml rstpep2html"
+for i in $binaries; do
+ [[ ! -L %{_bindir}/${i} ]] && rm -f %{_bindir}/${i}
+done
+exit 0
+
+%post
+update-alternatives \
+ --install %{_bindir}/rst2html rst2html %{_bindir}/rst2html-%{py_ver} 20 \
+ --slave %{_bindir}/rst2latex rst2latex %{_bindir}/rst2latex-%{py_ver} \
+ --slave %{_bindir}/rst2man rst2man %{_bindir}/rst2man-%{py_ver} \
+ --slave %{_bindir}/rst2odt rst2odt %{_bindir}/rst2odt-%{py_ver} \
+ --slave %{_bindir}/rst2odt_prepstyles rst2odt_prepstyles
%{_bindir}/rst2odt_prepstyles-%{py_ver} \
+ --slave %{_bindir}/rst2pseudoxml rst2pseudoxml
%{_bindir}/rst2pseudoxml-%{py_ver} \
+ --slave %{_bindir}/rst2s5 rst2s5 %{_bindir}/rst2s5-%{py_ver} \
+ --slave %{_bindir}/rst2xetex rst2xetex %{_bindir}/rst2xetex-%{py_ver} \
+ --slave %{_bindir}/rst2xml rst2xml %{_bindir}/rst2xml-%{py_ver} \
+ --slave %{_bindir}/rstpep2html rstpep2html %{_bindir}/rstpep2html-%{py_ver}
+
+%preun
+if [ $1 -eq 0 ] ; then
+ update-alternatives --remove rst2html %{_bindir}/rst2html-%{py_ver}
+fi
+
%files
%defattr(-,root,root,-)
%doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt BUGS.txt docs/*
licenses
-%{_bindir}/rst*
+%ghost %{_bindir}/rst2html
+%ghost %{_bindir}/rst2latex
+%ghost %{_bindir}/rst2man
+%ghost %{_bindir}/rst2odt
+%ghost %{_bindir}/rst2odt_prepstyles
+%ghost %{_bindir}/rst2pseudoxml
+%ghost %{_bindir}/rst2s5
+%ghost %{_bindir}/rst2xetex
+%ghost %{_bindir}/rst2xml
+%ghost %{_bindir}/rstpep2html
+%{_bindir}/rst*-%{py_ver}
%{python_sitelib}/docutils/
%{python_sitelib}/docutils-%{version}-py%{py_ver}.egg-info
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
