- Run testsuite

- Correctly fix non-excutable script warning
- Remove outdated macros
- Also remove "*.py" ending in egg-info files

- Run testsuite
- Correctly fix non-excutable script warning
- Remove outdated macros
- Name Python3 binaries consistently:
  + Fix in setup.py to have correct egg-info data

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=16

python-docutils.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov 20 19:34:53 UTC 2012 - saschpe@suse.de
+
+- Run testsuite
+- Correctly fix non-excutable script warning
+- Remove outdated macros
+- Also remove "*.py" ending in egg-info files
+
 -------------------------------------------------------------------
 Fri Oct 26 08:26:29 UTC 2012 - highwaystar.ru@gmail.com
 

python-docutils.spec

@@ -16,28 +16,21 @@
 #
 
 
-%define modname docutils
+Name:           python-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/%{modname}/%{modname}/%{version}/%{modname}-%{version}.tar.gz
+Source:         http://downloads.sourceforge.net/project/docutils/docutils/%{version}/docutils-%{version}.tar.gz
 BuildRequires:  python-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  python-nose
-%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
-Requires:       pyxml
-%endif
 Provides:       docutils = %{version}
 Obsoletes:      docutils < %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %else
@@ -50,24 +43,27 @@ 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 %{modname}-%{version}
+%setup -n docutils-%{version}
+# 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
+# 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
 
 %build
 python setup.py build
-sed -i "s|#!\s*\/usr\/bin\/env python||g" docutils/{math/math2html,_string_template_compat,error_reporting,writers/xetex/__init__,math/latex2mathml}.py # Fix non-executable scripts
 
 %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
+%check
-chmod +x %{buildroot}%{python_sitelib}/%{modname}/utils/code_analyzer.py
+nosetests
-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}/%{modname}/
+%{python_sitelib}/docutils/
-%{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/docutils-%{version}-py%{py_ver}.egg-info
 
 %changelog

python3-docutils.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Nov 20 19:36:25 UTC 2012 - saschpe@suse.de
+
+- Run testsuite
+- Correctly fix non-excutable script warning
+- Remove outdated macros
+- Name Python3 binaries consistently:
+  + Fix in setup.py to have correct egg-info data
+
 -------------------------------------------------------------------
 Fri Oct 26 08:25:52 UTC 2012 - highwaystar.ru@gmail.com
 

python3-docutils.spec

@@ -16,29 +16,23 @@
 #
 
 
-%define modname docutils
+Name:           python3-docutils
-Name:           python3-%{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/%{modname}/%{modname}/%{version}/%{modname}-%{version}.tar.gz
+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
 BuildRequires:  python3
 BuildRequires:  python3-2to3
 BuildRequires:  python3-devel
 BuildRequires:  python3-xml
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       python3-xml
-%if 0%{?suse_version} <= 1140
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%{!?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)}
-%endif
 BuildArch:      noarch
-Requires:       python3 >= %{py3_ver}
 
 %description
 Docutils is a modular system for processing documentation into useful formats,
@@ -46,36 +40,28 @@ 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 %{modname}-%{version}
+%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
+# 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
+
 %build
 python3 setup.py build
-sed -i "s|#!\s*\/usr\/bin\/env python3||g" docutils/{math/math2html,_string_template_compat,error_reporting,writers/xetex/__init__,math/latex2mathml}.py # Fix non-executable scripts
 
 %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
+# Remove unneeded directories:
-# 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}
+%{_bindir}/rst*-%{py3_ver}
-%{python3_sitelib}/%{modname}/
+%{python3_sitelib}/docutils/
-%{python3_sitelib}/%{modname}-%{version}-py%{py3_ver}.egg-info
+%{python3_sitelib}/docutils-%{version}-py%{py3_ver}.egg-info
-%if 0%{?suse_version} <= 1140
-%dir %{_prefix}/lib/python%{py3_ver}
-%dir %{python3_sitelib}
-%endif
 
 %changelog