Hello community, here is the log from the commit of package python3-Sphinx for openSUSE:Factory checked in at 2014-03-11 20:33:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-Sphinx (Old) and /work/SRC/openSUSE:Factory/.python3-Sphinx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-Sphinx" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-Sphinx/python3-Sphinx.changes 2013-09-25 14:36:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-Sphinx.new/python3-Sphinx.changes 2014-03-11 20:33:09.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Mar 7 13:21:05 UTC 2014 - [email protected] + +- Fix hardcoded python version typo + +------------------------------------------------------------------- +Fri Feb 14 15:52:13 UTC 2014 - [email protected] + +- Drop junk files + +------------------------------------------------------------------- +Mon Feb 10 15:45:19 UTC 2014 - [email protected] + +- Update to version 1.2.1 + + See CHANGES +- Fix update-alternatives usage +- Removed sphinx-setup_command_unicode.patch (upstream) +- Totally reworked the build, docs are now build from BUILDROOT as Sphinx + has it's own way of invoken 2to3 +- Dropped python3-Sphinx-docs.patch (not needed anymore) + +------------------------------------------------------------------- Old: ---- Sphinx-1.1.3.tar.gz python3-Sphinx-docs.patch sphinx-docutils-0.10.patch New: ---- Sphinx-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-Sphinx.spec ++++++ --- /var/tmp/diff_new_pack.wUOeE3/_old 2014-03-11 20:33:10.000000000 +0100 +++ /var/tmp/diff_new_pack.wUOeE3/_new 2014-03-11 20:33:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-Sphinx # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,21 +17,16 @@ Name: python3-Sphinx -Version: 1.1.3 +Version: 1.2.1 Release: 0 Url: http://sphinx.pocoo.org Summary: Python documentation generator License: BSD-2-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz -Patch0: python3-Sphinx-docs.patch -# PATCH-FIX-UPSTREAM sphinx-docutils-0.10.patch fix python-sphinx for python-docutils >= 0.10 -# See: https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage -# Will be in python-sphinx 1.2 -Patch1: sphinx-docutils-0.10.patch BuildRequires: python3-2to3 BuildRequires: python3-devel -BuildRequires: python3-distribute +BuildRequires: python3-setuptools # Documentation requirements: BuildRequires: python3-Jinja2 BuildRequires: python3-docutils @@ -42,8 +37,8 @@ Requires(postun): update-alternatives Requires: python3-Jinja2 Requires: python3-Pygments -Requires: python3-distribute Requires: python3-docutils +Requires: python3-setuptools Recommends: python3-rst2pdf BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -79,49 +74,39 @@ %prep %setup -q -n Sphinx-%{version} -%patch0 -%patch1 -p1 sed -i '/#\!/d' sphinx/pycode/pgen2/token.py # Fix non-excutable-script warning # Add Interpreter version suffix to entrypoints (and thus /usr/bin binaries) to # allow for update-alternatives later on: sed -i "s|\(sphinx-.*\) =|\1-%{py3_ver} =|" setup.py # Add Python version suffix to binaries -sed -i "s|'\(sphinx-[a-z]*\)'|'\1-%{py3_ver}'|" doc/conf.py # Do the same for man-pages %build -2to3 . -w --nobackups -python3 setup.py build -python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo # Build HTML documentation -python3 setup.py build_sphinx -b man # Build man-pages +#NOTE(saschpe): We have custom fixes only invoked during 'install'. Using 2to3 in %build will break things, +# later on. Thus run 'setup.py install first' and generate docs afterwards with the sphinx-build in BUILDROOT. +#TODO(saschpe): Check back at some point to see if this changed... +##2to3 -wn . +##python3 setup.py build +##python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo # Build HTML documentation +##python3 setup.py build_sphinx -b man # Build man-pages %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +for builder in html man ; do + PYTHONPATH=%{buildroot}%{python3_sitelib} %{buildroot}%{_bindir}/sphinx-build-%{py3_ver} -b $builder doc/ build/sphinx/$builder +done +rm -rf build/sphinx/html/{.buildinfo,.doctrees} +mkdir -p %{buildroot}%{_sysconfdir}/alternatives for B in apidoc autogen build quickstart ; do - ln -s %{_bindir}/sphinx-$B-%{py3_ver} %{buildroot}%{_bindir}/sphinx-$B + touch %{buildroot}%{_sysconfdir}/alternatives/sphinx-$B + ln -sf %{_sysconfdir}/alternatives/sphinx-$B %{buildroot}/%{_bindir}/sphinx-$B done install -d %{buildroot}%{_mandir}/man1/ for M in all apidoc build quickstart ; do - install -m 644 build/sphinx/man/sphinx-$M-%{py3_ver}.1 %{buildroot}%{_mandir}/man1/sphinx-$M-%{py3_ver}.1 - ln -s %{_mandir}/man1/sphinx-$M-%{py3_ver}.1 %{buildroot}%{_mandir}/man1/sphinx-$M.1 + install -m 644 build/sphinx/man/sphinx-$M.1 %{buildroot}%{_mandir}/man1/sphinx-$M-%{py3_ver}.1 + touch %{buildroot}%{_sysconfdir}/alternatives/sphinx-$M.1.gz + ln -sf %{_sysconfdir}/alternatives/sphinx-$M.1.gz %{buildroot}%{_mandir}/man1/sphinx-$M.1.gz done %find_lang sphinx -#TODO: Fix -#%%check -#nosetests-%%{py3_ver} - -%pre -# Since /usr/bin/sphinx-* 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: -[[ ! -L %{_bindir}/sphinx-apidoc ]] && rm -f %{_bindir}/sphinx-apidoc -[[ ! -L %{_bindir}/sphinx-build ]] && rm -f %{_bindir}/sphinx-build -[[ ! -L %{_bindir}/sphinx-autogen ]] && rm -f %{_bindir}/sphinx-autogen -[[ ! -L %{_bindir}/sphinx-quickstart ]] && rm -f %{_bindir}/sphinx-quickstart -[[ ! -L %{_mandir}/man1/sphinx-all.1.gz ]] && rm -f %{_mandir}/man1/sphinx-all.1.gz -[[ ! -L %{_mandir}/man1/sphinx-apidoc.1.gz ]] && rm -f %{_mandir}/man1/sphinx-apidoc.1.gz -[[ ! -L %{_mandir}/man1/sphinx-build.1.gz ]] && rm -f %{_mandir}/man1/sphinx-build.1.gz -[[ ! -L %{_mandir}/man1/sphinx-quickstart.1.gz ]] && rm -f %{_mandir}/man1/sphinx-quickstart.1.gz -exit 0 - %post update-alternatives \ --install %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{py3_ver} 30 \ @@ -133,32 +118,43 @@ --slave %{_mandir}/man1/sphinx-build.1.gz sphinx-build.1 %{_mandir}/sphinx-build-%{py3_ver}.1.gz \ --slave %{_mandir}/man1/sphinx-quickstart.1.gz sphinx-quickstart.1 %{_mandir}/sphinx-quickstart-%{py3_ver}.1.gz \ -%preun +%postun if [ $1 -eq 0 ] ; then update-alternatives --remove sphinx-build %{_bindir}/sphinx-apidoc-%{py3_ver} fi +%check +PYTHON=python3 make test + %files -f sphinx.lang %defattr(-,root,root,-) -%doc AUTHORS CHANGES LICENSE README TODO -%ghost %attr(0755,root,root) %{_bindir}/sphinx-apidoc +%doc AUTHORS CHANGES LICENSE README.rst TODO +%{_bindir}/sphinx-apidoc %{_bindir}/sphinx-apidoc-%{py3_ver} -%ghost %attr(0755,root,root) %{_bindir}/sphinx-autogen +%{_bindir}/sphinx-autogen %{_bindir}/sphinx-autogen-%{py3_ver} -%ghost %attr(0755,root,root) %{_bindir}/sphinx-build +%{_bindir}/sphinx-build %{_bindir}/sphinx-build-%{py3_ver} -%ghost %attr(0755,root,root) %{_bindir}/sphinx-quickstart +%{_bindir}/sphinx-quickstart %{_bindir}/sphinx-quickstart-%{py3_ver} -%ghost %{_mandir}/man1/sphinx-all.1.gz +%{_mandir}/man1/sphinx-all.1.gz %{_mandir}/man1/sphinx-all-%{py3_ver}.1.gz -%ghost %{_mandir}/man1/sphinx-apidoc.1.gz +%{_mandir}/man1/sphinx-apidoc.1.gz %{_mandir}/man1/sphinx-apidoc-%{py3_ver}.1.gz -%ghost %{_mandir}/man1/sphinx-build.1.gz +%{_mandir}/man1/sphinx-build.1.gz %{_mandir}/man1/sphinx-build-%{py3_ver}.1.gz -%ghost %{_mandir}/man1/sphinx-quickstart.1.gz +%{_mandir}/man1/sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{py3_ver}.1.gz %{python3_sitelib}/sphinx/ %{python3_sitelib}/Sphinx-%{version}-py%{py3_ver}.egg-info +%ghost %{_sysconfdir}/alternatives/sphinx-apidoc +%ghost %{_sysconfdir}/alternatives/sphinx-autogen +%ghost %{_sysconfdir}/alternatives/sphinx-build +%ghost %{_sysconfdir}/alternatives/sphinx-quickstart +%ghost %{_sysconfdir}/alternatives/sphinx-all.1.gz +%ghost %{_sysconfdir}/alternatives/sphinx-apidoc.1.gz +%ghost %{_sysconfdir}/alternatives/sphinx-build.1.gz +%ghost %{_sysconfdir}/alternatives/sphinx-quickstart.1.gz %files doc %defattr(-,root,root,-) ++++++ Sphinx-1.1.3.tar.gz -> Sphinx-1.2.1.tar.gz ++++++ ++++ 53398 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
