From cc08cbbd1a7b7ea3f4e635c67a96679d37f401735ee5b9c1a3b7e08c765ad21e Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 18 May 2012 12:07:51 +0000 Subject: [PATCH] Accepting request 121396 from home:TheBlackCat:branches:devel:languages:python - Update to version 0.9: - Cleaned up spec files - Fix rpmlint warnings OBS-URL: https://build.opensuse.org/request/show/121396 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=12 --- docutils-0.8.1.tar.gz | 3 --- docutils-0.9.tar.gz | 3 +++ python-docutils.changes | 23 +++++++++++++++++++++++ python-docutils.spec | 17 +++++++++++------ python3-docutils.changes | 30 ++++++++++++++++++++++++++++++ python3-docutils.spec | 33 +++++++++++++++++++++------------ 6 files changed, 88 insertions(+), 21 deletions(-) delete mode 100644 docutils-0.8.1.tar.gz create mode 100644 docutils-0.9.tar.gz diff --git a/docutils-0.8.1.tar.gz b/docutils-0.8.1.tar.gz deleted file mode 100644 index 91ae38a..0000000 --- a/docutils-0.8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a3b776518257a59fefaf48ef1e0635bc1179f8cafb02a9cc84c9644bb25df71 -size 1499832 diff --git a/docutils-0.9.tar.gz b/docutils-0.9.tar.gz new file mode 100644 index 0000000..e8834fd --- /dev/null +++ b/docutils-0.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff49bf77e9135490a73740d884b418ab8b982ad16ee52cfe796d059c592ea245 +size 1534138 diff --git a/python-docutils.changes b/python-docutils.changes index 9630fc3..9393a74 100644 --- a/python-docutils.changes +++ b/python-docutils.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu May 3 14:28:17 UTC 2012 - toddrme2178@gmail.com + +- Update to version 0.9: + * reStructuredText "code" role and directive with syntax + highlighting by Pygments_. + * "code" option of the "include" directive. + * Fix [ 3402314 ] allow non-ASCII whitespace, punctuation + characters and "international" quotes around inline markup. + * Fix handling of missing stylesheets. + * Fix [ 2971827 ] and [ 3442827 ] extras/roman.py moved to + docutils/utils/roman.py + * docutils.utils is now a package (providing a place for + sub-modules) + * change default for `math-output` setting to MathJax + * Support the `abbreviation` and `acronym` standard roles. + * Record only files required to generate the LaTeX source as + dependencies. + * Use ``\setcounter{secnumdepth}{0}`` instead of ``*``-versions + when suppressing LaTeX section numbering. +- Cleaned up spec files +- Fix rpmlint warnings + ------------------------------------------------------------------- Mon Apr 30 14:07:34 UTC 2012 - cfarrell@suse.com diff --git a/python-docutils.spec b/python-docutils.spec index b4a69a4..836ab28 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -15,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -Name: python-docutils -Version: 0.8.1 +%define modname docutils +Name: python-%{modname} +Version: 0.9 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 +Source: http://downloads.sourceforge.net/project/%{modname}/%{modname}/%{version}/%{modname}-%{version}.tar.gz BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: python-xml Requires: python-xml +%py_requires %endif %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: pyxml @@ -48,7 +49,7 @@ such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax. %prep -%setup -n docutils-%{version} +%setup -n %{modname}-%{version} %build python setup.py build @@ -57,11 +58,15 @@ sed -i "s|#!\s*\/usr\/bin\/env python||g" docutils/{math/math2html,_string_templ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} for i in %{buildroot}%{_bindir}/rst*; do mv "$i" "${i/.py}"; done # Remove useless ".py" ending from executables +# fix for non-executable-script rpmlint warning +chmod +x %{buildroot}%{python_sitelib}/%{modname}/utils/code_analyzer.py +chmod +x %{buildroot}%{python_sitelib}/%{modname}/utils/punctuation_chars.py %files %defattr(-,root,root,-) %doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt BUGS.txt docs/* licenses %{_bindir}/rst* -%{python_sitelib}/* +%{python_sitelib}/%{modname}/ +%{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info %changelog diff --git a/python3-docutils.changes b/python3-docutils.changes index 4af1a2a..09fabad 100644 --- a/python3-docutils.changes +++ b/python3-docutils.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu May 3 14:28:17 UTC 2012 - toddrme2178@gmail.com + +- Update to version 0.9: + * reStructuredText "code" role and directive with syntax + highlighting by Pygments_. + * "code" option of the "include" directive. + * Fix [ 3402314 ] allow non-ASCII whitespace, punctuation + characters and "international" quotes around inline markup. + * Fix handling of missing stylesheets. + * Fix [ 2971827 ] and [ 3442827 ] extras/roman.py moved to + docutils/utils/roman.py + * docutils.utils is now a package (providing a place for + sub-modules) + * change default for `math-output` setting to MathJax + * Support the `abbreviation` and `acronym` standard roles. + * Record only files required to generate the LaTeX source as + dependencies. + * Use ``\setcounter{secnumdepth}{0}`` instead of ``*``-versions + when suppressing LaTeX section numbering. +- Cleaned up spec files +- Fix rpmlint warnings + +------------------------------------------------------------------- +Mon Apr 30 14:07:34 UTC 2012 - cfarrell@suse.com + +- license update: Python-2.0 and BSD-2-Clause and GPL-2.0+ and GPL-3.0+ and + SUSE-Public-Domain + tools/editors/emacs/rst.el is GPL-3.0+ - see also COPYING file + ------------------------------------------------------------------- Fri Apr 27 14:07:19 UTC 2012 - toddrme2178@gmail.com diff --git a/python3-docutils.spec b/python3-docutils.spec index d70264b..98d177c 100644 --- a/python3-docutils.spec +++ b/python3-docutils.spec @@ -15,15 +15,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -Name: python3-docutils -Version: 0.8.1 +%define modname docutils +Name: python3-%{modname} +Version: 0.9 Release: 0 -License: public domain, Python, BSD-2-Clause, GPL (see COPYING.txt) Summary: Python Documentation Utilities -Url: http://docutils.sourceforge.net/ +License: Python-2.0 and BSD-2-Clause and GPL-2.0+ and GPL-3.0+ and SUSE-Public-Domain Group: Development/Languages/Python -Source: http://downloads.sourceforge.net/project/docutils/docutils/0.8.1/docutils-0.8.1.tar.gz +Url: http://docutils.sourceforge.net/ +Source: http://downloads.sourceforge.net/project/%{modname}/%{modname}/%{version}/%{modname}-%{version}.tar.gz BuildRequires: python3 BuildRequires: python3-2to3 BuildRequires: python3-devel @@ -33,10 +33,6 @@ Requires: python3-xml %if 0%{?suse_version} <= 1140 %{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)} -%ifarch x86_64 -# to allow ownership of noarch python directories -BuildRequires: python3-32bit -%endif %endif BuildArch: noarch Requires: python3 >= %{py3_ver} @@ -47,7 +43,7 @@ such as HTML, XML, and LaTeX. For input Docutils supports reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext markup syntax. %prep -%setup -n docutils-%{version} +%setup -n %{modname}-%{version} %build python3 setup.py build @@ -56,13 +52,26 @@ sed -i "s|#!\s*\/usr\/bin\/env python3||g" docutils/{math/math2html,_string_temp %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} for i in %{buildroot}%{_bindir}/rst*; do mv "$i" "${i/.py}-python%{py3_ver}"; done # Remove useless ".py" ending from executables and add -python3.x suffix +# fix for non-executable-script rpmlint warning +chmod +x %{buildroot}%{python3_sitelib}/%{modname}/_string_template_compat.py +chmod +x %{buildroot}%{python3_sitelib}/%{modname}/error_reporting.py +chmod +x %{buildroot}%{python3_sitelib}/%{modname}/math/latex2mathml.py +chmod +x %{buildroot}%{python3_sitelib}/%{modname}/math/math2html.py +chmod +x %{buildroot}%{python3_sitelib}/%{modname}/utils/code_analyzer.py +chmod +x %{buildroot}%{python3_sitelib}/%{modname}/utils/punctuation_chars.py +chmod +x %{buildroot}%{python3_sitelib}/%{modname}/writers/xetex/__init__.py +# remove unneeded directories +rm -r %{buildroot}%{python3_sitelib}/test/ +rm -r %{buildroot}%{python3_sitelib}/tools/ %files %defattr(-,root,root,-) %doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt BUGS.txt docs/* licenses %{_bindir}/rst*-python%{py3_ver} -%{python3_sitelib}/* +%{python3_sitelib}/%{modname}/ +%{python3_sitelib}/%{modname}-%{version}-py%{py3_ver}.egg-info %if 0%{?suse_version} <= 1140 +%dir %{_prefix}/lib/python%{py3_ver} %dir %{python3_sitelib} %endif