diff --git a/Sphinx-1.6.5.tar.gz b/Sphinx-1.6.5.tar.gz deleted file mode 100644 index ff42630..0000000 --- a/Sphinx-1.6.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6de5dbdbb7a0d7d2757f4389cc00e8f6eb3c49e1772378967a12cfcf2cfe098 -size 4680974 diff --git a/Sphinx-1.7.4.tar.gz b/Sphinx-1.7.4.tar.gz new file mode 100644 index 0000000..ee6fa71 --- /dev/null +++ b/Sphinx-1.7.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9b1a75a3eae05dded19c80eb17325be675e0698975baae976df603b6ed1eb10 +size 4722408 diff --git a/python-Sphinx-doc.changes b/python-Sphinx-doc.changes index cf5bbc7..9d48259 100644 --- a/python-Sphinx-doc.changes +++ b/python-Sphinx-doc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 23 12:17:03 UTC 2018 - mimi.vx@gmail.com + +- update to 1.7.4 +- ver long list of changes - please check www.sphinx-doc.org for details + ------------------------------------------------------------------- Sat Feb 24 18:31:35 UTC 2018 - arun@gmx.de diff --git a/python-Sphinx-doc.spec b/python-Sphinx-doc.spec index 8ba62f3..789d540 100644 --- a/python-Sphinx-doc.spec +++ b/python-Sphinx-doc.spec @@ -16,32 +16,29 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} %if 0%{?suse_version} != 1315 %bcond_without latex %else %bcond_with latex %endif - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-Sphinx-doc -Version: 1.6.5 +Version: 1.7.4 Release: 0 -Url: http://sphinx-doc.org Summary: Documentation for python-Sphinx License: BSD-2-Clause Group: Documentation/Other +URL: http://sphinx-doc.org Source: https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz Patch1: disable-test.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes +BuildRequires: python-rpm-macros BuildRequires: python3-Sphinx +Recommends: %{name}-html = %{version} +BuildArch: noarch %if %{with latex} BuildRequires: python3-Sphinx-latex %endif -BuildRequires: python-rpm-macros -Recommends: %{name}-html = %{version} -BuildArch: noarch - %python_subpackages %description @@ -106,8 +103,8 @@ Sphinx executables. mkdir build.doc -%__python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo -%__python3 setup.py build_sphinx -b man +python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo +python3 setup.py build_sphinx -b man mv build/sphinx/{html,man} build.doc/ @@ -128,29 +125,29 @@ mv build.doc/man/sphinx-quickstart.1 %{buildroot}%{_mandir}/man1/sphinx-quicksta %python_clone %{buildroot}%{_mandir}/man1/sphinx-quickstart.1 %files %{python_files} -%defattr(-,root,root,-) -%doc AUTHORS LICENSE EXAMPLES +%license LICENSE +%doc AUTHORS EXAMPLES %files %{python_files man} -%defattr(-,root,root,-) -%doc AUTHORS LICENSE -%{_mandir}/man1/sphinx-all-%{python_bin_suffix}.1%ext_man -%{_mandir}/man1/sphinx-apidoc-%{python_bin_suffix}.1%ext_man -%{_mandir}/man1/sphinx-build-%{python_bin_suffix}.1%ext_man -%{_mandir}/man1/sphinx-quickstart-%{python_bin_suffix}.1%ext_man +%license LICENSE +%doc AUTHORS +%{_mandir}/man1/sphinx-all-%{python_bin_suffix}.1%{?ext_man} +%{_mandir}/man1/sphinx-apidoc-%{python_bin_suffix}.1%{?ext_man} +%{_mandir}/man1/sphinx-build-%{python_bin_suffix}.1%{?ext_man} +%{_mandir}/man1/sphinx-quickstart-%{python_bin_suffix}.1%{?ext_man} %files -n %{name}-html -%defattr(-,root,root,-) -%doc AUTHORS LICENSE +%license LICENSE +%doc AUTHORS %dir %{_docdir}/python-Sphinx/ %{_docdir}/python-Sphinx/html/ %files -n %{name}-man-common -%defattr(-,root,root,-) -%doc AUTHORS LICENSE -%{_mandir}/man1/sphinx-all.1%ext_man -%{_mandir}/man1/sphinx-apidoc.1%ext_man -%{_mandir}/man1/sphinx-build.1%ext_man -%{_mandir}/man1/sphinx-quickstart.1%ext_man +%license LICENSE +%doc AUTHORS +%{_mandir}/man1/sphinx-all.1%{?ext_man} +%{_mandir}/man1/sphinx-apidoc.1%{?ext_man} +%{_mandir}/man1/sphinx-build.1%{?ext_man} +%{_mandir}/man1/sphinx-quickstart.1%{?ext_man} %changelog diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 614898a..e53c118 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 23 12:14:49 UTC 2018 - mimi.vx@gmail.com + +- update to 1.7.4 +- very long list of changes - please see http://www.sphinx-doc.org/en/master/changes.html#release-1-7-4-released-apr-25-2018 + ------------------------------------------------------------------- Thu Mar 8 10:22:47 UTC 2018 - aplanas@suse.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 70aac1f..04d2659 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -16,28 +16,28 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define oldpython python %if 0%{?suse_version} != 1315 %bcond_without latex %else %bcond_with latex %endif - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define oldpython python Name: python-Sphinx -Version: 1.6.5 +Version: 1.7.4 Release: 0 -Url: http://sphinx-doc.org Summary: Python documentation generator License: BSD-2-Clause Group: Development/Languages/Python +URL: http://sphinx-doc.org Source: https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz Patch1: disable-test.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +# workaround for suboptimal CentOS-7 project config +#!BuildIgnore: texinfo Requires: python-Babel >= 1.3 Requires: python-Jinja2 >= 2.3 Requires: python-Pygments >= 2.0 @@ -50,10 +50,13 @@ Requires: python-snowballstemmer >= 1.1 Requires: python-sphinx_rtd_theme Requires: python-sphinxcontrib Requires: python-sphinxcontrib-websupport +Requires(post): update-alternatives +Requires(postun): update-alternatives +BuildArch: noarch %if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24 +Recommends: %{name}-doc-man Recommends: python-SQLAlchemy >= 0.9 Recommends: python-Whoosh >= 2.0 -Recommends: %{name}-doc-man %endif %ifpython2 Requires: python-enum34 @@ -64,21 +67,13 @@ Requires: python-typing Requires: python-typing %endif %endif -Requires(post): update-alternatives -Requires(postun): update-alternatives - %if 0%{?suse_version} Recommends: python-rst2pdf %endif -# workaround for suboptimal CentOS-7 project config -#!BuildIgnore: texinfo - %ifpython2 Obsoletes: %{oldpython}-sphinx < %{version} Provides: %{oldpython}-sphinx = %{version} %endif -BuildArch: noarch - %python_subpackages %description @@ -193,8 +188,8 @@ sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line en %python_uninstall_alternative sphinx-apidoc %files %{python_files} -%defattr(-,root,root,-) -%doc AUTHORS CHANGES LICENSE README.rst +%license LICENSE +%doc AUTHORS CHANGES README.rst %python_alternative %{_bindir}/sphinx-apidoc %python_alternative %{_bindir}/sphinx-autogen %python_alternative %{_bindir}/sphinx-build @@ -208,8 +203,8 @@ sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line en # Requirements are not available on SLES %if %{with latex} %files %{python_files latex} -%defattr(-,root,root,-) -%doc AUTHORS LICENSE +%license LICENSE +%doc AUTHORS %{python_sitelib}/sphinx/texinputs/ %endif