Hello community, here is the log from the commit of package python3-docutils for openSUSE:Factory checked in at 2013-09-23 10:53:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-docutils (Old) and /work/SRC/openSUSE:Factory/.python3-docutils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-docutils" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-docutils/python3-docutils.changes 2013-06-21 19:01:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-docutils.new/python3-docutils.changes 2013-09-23 11:17:43.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Sep 16 12:09:07 UTC 2013 - tchva...@suse.com + +- Fix the symlink creation. + +------------------------------------------------------------------- +Mon Sep 16 10:42:21 UTC 2013 - tchva...@suse.com + +- Version bump to 0.10 to match py2 version. + * SmartQuotes transform for typographic quotes and dashes. + * FileInput/FileOutput: no system-exit on IOError. The handle_io_errors option is ignored. + * <code> tag for inline "code", do not drop nested inline nodes (syntax highlight tokens). + * Customizable MathJax URL (based on patch by Dmitry Shachnev). + * No line break after opening inline math tag. +- Mask testsuite for now as it fail. +- Drop r7486-python33-compat.patch as it is not needed. +- Add rpmlint-non-executable-scripts.diff. +- Use update-alternatives for binaries so we can switch between + py2 and py3. + +------------------------------------------------------------------- Old: ---- docutils-0.9.tar.gz r7486-python33-compat.patch New: ---- docutils-0.10.tar.gz rpmlint-non-executable-scripts.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-docutils.spec ++++++ --- /var/tmp/diff_new_pack.6A2SgV/_old 2013-09-23 11:17:44.000000000 +0200 +++ /var/tmp/diff_new_pack.6A2SgV/_new 2013-09-23 11:17:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-docutils # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,18 @@ Name: python3-docutils -Version: 0.9 +Version: 0.10 Release: 0 Summary: Python Documentation Utilities License: Python-2.0 and BSD-2-Clause and GPL-2.0+ and GPL-3.0+ and SUSE-Public-Domain Group: Development/Languages/Python Url: http://docutils.sourceforge.net/ Source: http://downloads.sourceforge.net/project/docutils/docutils/%{version}/docutils-%{version}.tar.gz -# patch from upstream: r7486 Fix [3541369] Relative __import__ also with Python 3.3 -Patch0: r7486-python33-compat.patch +Patch0: rpmlint-non-executable-scripts.diff BuildRequires: python3 BuildRequires: python3-2to3 BuildRequires: python3-devel +BuildRequires: python3-nose BuildRequires: python3-xml Requires: python3-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,9 +41,7 @@ %prep %setup -n docutils-%{version} -%patch0 -p2 -# Fix non-executable scripts: -sed -i "s|#!.*||g" docutils/{math/math2html,_string_template_compat,error_reporting,writers/xetex/__init__,math/latex2mathml}.py docutils/utils/{code_analyzer,punctuation_chars}.py +%patch0 # Remove useless ".py" ending from executables: for i in tools/rst*; do mv "$i" "${i/.py}-%{py3_ver}"; done sed -i "s|'tools/\(rst.*\)\.py'|'tools/\1-%{py3_ver}'|" setup.py @@ -53,13 +51,56 @@ %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -# Remove unneeded directories: -rm -r %{buildroot}%{python3_sitelib}/test/ -rm -r %{buildroot}%{python3_sitelib}/tools/ +binaries="rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html" +for i in $binaries; do + ln -s %{_bindir}/${i}-%{py3_ver} %{buildroot}%{_bindir}/${i} +done + +# Fails test for now, all of them +#%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-%{py3_ver} 30 \ + --slave %{_bindir}/rst2latex rst2latex %{_bindir}/rst2latex-%{py3_ver} \ + --slave %{_bindir}/rst2man rst2man %{_bindir}/rst2man-%{py3_ver} \ + --slave %{_bindir}/rst2odt rst2odt %{_bindir}/rst2odt-%{py3_ver} \ + --slave %{_bindir}/rst2odt_prepstyles rst2odt_prepstyles %{_bindir}/rst2odt_prepstyles-%{py3_ver} \ + --slave %{_bindir}/rst2pseudoxml rst2pseudoxml %{_bindir}/rst2pseudoxml-%{py3_ver} \ + --slave %{_bindir}/rst2s5 rst2s5 %{_bindir}/rst2s5-%{py3_ver} \ + --slave %{_bindir}/rst2xetex rst2xetex %{_bindir}/rst2xetex-%{py3_ver} \ + --slave %{_bindir}/rst2xml rst2xml %{_bindir}/rst2xml-%{py3_ver} \ + --slave %{_bindir}/rstpep2html rstpep2html %{_bindir}/rstpep2html-%{py3_ver} + +%preun +if [ $1 -eq 0 ] ; then + update-alternatives --remove rst2html %{_bindir}/rst2html-%{py3_ver} +fi %files %defattr(-,root,root,-) %doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt BUGS.txt docs/* licenses +%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*-%{py3_ver} %{python3_sitelib}/docutils/ %{python3_sitelib}/docutils-%{version}-py%{py3_ver}.egg-info ++++++ docutils-0.9.tar.gz -> docutils-0.10.tar.gz ++++++ ++++ 33892 lines of diff (skipped) ++++++ rpmlint-non-executable-scripts.diff ++++++ ++++ 1515 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
