From f9fed3c555224c103be28841b37aeb5df0509d329455d1bdbb3921773674881a Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 28 Feb 2012 08:59:33 +0000 Subject: [PATCH 1/5] - Fixed SLE_11_SP2 build by disabling the testsuite OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=6 --- python-docutils.changes | 5 +++++ python-docutils.spec | 28 ++++++++++++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/python-docutils.changes b/python-docutils.changes index 2fda18a..013b71f 100644 --- a/python-docutils.changes +++ b/python-docutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 28 08:58:23 UTC 2012 - saschpe@suse.de + +- Fixed SLE_11_SP2 build by disabling the testsuite + ------------------------------------------------------------------- Fri Sep 23 10:19:38 UTC 2011 - saschpe@suse.de diff --git a/python-docutils.spec b/python-docutils.spec index f140447..6dbc003 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -1,7 +1,7 @@ # # spec file for package python-docutils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -11,22 +11,21 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. - +# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: python-docutils Version: 0.8.1 Release: 0 -Url: http://docutils.sourceforge.net/ -Summary: Python Documentation Utilities License: public domain, Python, BSD-2-Clause, GPL (see COPYING.txt) +Summary: Python Documentation Utilities +Url: http://docutils.sourceforge.net/ Group: Development/Languages/Python Source: http://downloads.sourceforge.net/project/docutils/docutils/0.8.1/docutils-0.8.1.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: python-xml Requires: python-xml @@ -35,15 +34,13 @@ Requires: python-xml BuildRequires: pyxml Requires: pyxml %endif -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 -BuildArch: noarch -%endif -%endif Provides: docutils = %{version} Obsoletes: docutils < %{version} -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%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 +BuildArch: noarch +%endif %description Docutils is a modular system for processing documentation into useful formats, @@ -55,15 +52,14 @@ easy-to-read, what-you-see-is-what-you-get plaintext markup syntax. %build python setup.py build -sed -i "1d" docutils/{math/math2html,_string_template_compat,error_reporting,writers/xetex/__init__,math/latex2mathml}.py # Fix non-executable scripts +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 # Tests break SLE and Mandriva builds -%if ! 0%{?sles_version} && ! 0%{?mandriva_version} - +%if ! (0%{?suse_version} && 0%{?suse_version} <= 1110) && ! 0%{?mandriva_version} %check cd test && python alltests.py %endif From ca9dca7322af6de8f781f5158b8d0f35d04d0b2bf6c62146ce43f39bb0e3dded Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 24 Apr 2012 09:02:56 +0000 Subject: [PATCH 2/5] - Disable testsuite altogether, fails also on the bleeding_edge_* repos OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=7 --- python-docutils.changes | 5 +++++ python-docutils.spec | 16 +++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/python-docutils.changes b/python-docutils.changes index 013b71f..e801b43 100644 --- a/python-docutils.changes +++ b/python-docutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 24 09:02:35 UTC 2012 - saschpe@suse.de + +- Disable testsuite altogether, fails also on the bleeding_edge_* repos + ------------------------------------------------------------------- Tue Feb 28 08:58:23 UTC 2012 - saschpe@suse.de diff --git a/python-docutils.spec b/python-docutils.spec index 6dbc003..946233c 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -11,7 +11,7 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,11 +19,11 @@ Name: python-docutils Version: 0.8.1 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, BSD-2-Clause, GPL-2.0+ 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/docutils/docutils/%{version}/docutils-%{version}.tar.gz BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} @@ -58,16 +58,10 @@ sed -i "s|#!\s*\/usr\/bin\/env python||g" docutils/{math/math2html,_string_templ 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 -# Tests break SLE and Mandriva builds -%if ! (0%{?suse_version} && 0%{?suse_version} <= 1110) && ! 0%{?mandriva_version} -%check -cd test && python alltests.py -%endif - %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}/* %changelog From b2adf4b1b1a2498536578e3bbc2a982c02a80f74fdc2d785d38b2af73bbfb31a Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 24 Apr 2012 09:18:46 +0000 Subject: [PATCH 3/5] Accepting request 115138 from home:TheBlackCat:branches:devel:languages:python Added python 3 package. Please create a link from python-docutils to python3-docutils OBS-URL: https://build.opensuse.org/request/show/115138 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=8 --- python3-docutils.changes | 5 ++++ python3-docutils.spec | 61 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 python3-docutils.changes create mode 100644 python3-docutils.spec diff --git a/python3-docutils.changes b/python3-docutils.changes new file mode 100644 index 0000000..a49df8e --- /dev/null +++ b/python3-docutils.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Apr 23 12:00:49 UTC 2012 - toddrme2178@gmail.com + +- Add python 3 package + diff --git a/python3-docutils.spec b/python3-docutils.spec new file mode 100644 index 0000000..5aba5c6 --- /dev/null +++ b/python3-docutils.spec @@ -0,0 +1,61 @@ +# +# spec file for package python3-docutils +# +# Copyright (c) 2012 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: python3-docutils +Version: 0.8.1 +Release: 0 +License: public domain, Python, BSD-2-Clause, GPL (see COPYING.txt) +Summary: Python Documentation Utilities +Url: http://docutils.sourceforge.net/ +Group: Development/Languages/Python +Source: http://downloads.sourceforge.net/project/docutils/docutils/0.8.1/docutils-0.8.1.tar.gz +BuildRequires: python3 +BuildRequires: python3-2to3 +BuildRequires: python3-devel +BuildRequires: python3-xml +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: python3-xml +Requires: python3 >= %{py3_ver} +BuildArch: noarch +%if 0%{?suse_version} <= 1140 +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif + +%description +Docutils is a modular system for processing documentation into useful formats, +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} + +%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 + +%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}/* + +%changelog From ce2faa6a604d88c81c94aa4bbc7bfee7cbc2ac8f48c7d9b6460f20db0837bde9 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 30 Apr 2012 11:52:42 +0000 Subject: [PATCH 4/5] Accepting request 116030 from devel:languages:python3 Fix building python 3 package on openSUSE 11.4 x86_64 (forwarded request 116029 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/116030 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=9 --- python-docutils.changes | 5 +++++ python3-docutils.changes | 5 +++++ python3-docutils.spec | 12 ++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/python-docutils.changes b/python-docutils.changes index e801b43..92fa4df 100644 --- a/python-docutils.changes +++ b/python-docutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 27 14:07:19 UTC 2012 - toddrme2178@gmail.com + +- Fix building python 3 package on openSUSE 11.4 x86_64 + ------------------------------------------------------------------- Tue Apr 24 09:02:35 UTC 2012 - saschpe@suse.de diff --git a/python3-docutils.changes b/python3-docutils.changes index a49df8e..4af1a2a 100644 --- a/python3-docutils.changes +++ b/python3-docutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 27 14:07:19 UTC 2012 - toddrme2178@gmail.com + +- Fix building python 3 package on openSUSE 11.4 x86_64 + ------------------------------------------------------------------- Mon Apr 23 12:00:49 UTC 2012 - toddrme2178@gmail.com diff --git a/python3-docutils.spec b/python3-docutils.spec index 5aba5c6..d70264b 100644 --- a/python3-docutils.spec +++ b/python3-docutils.spec @@ -30,11 +30,16 @@ BuildRequires: python3-devel BuildRequires: python3-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python3-xml -Requires: python3 >= %{py3_ver} -BuildArch: noarch %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} %description Docutils is a modular system for processing documentation into useful formats, @@ -57,5 +62,8 @@ for i in %{buildroot}%{_bindir}/rst*; do mv "$i" "${i/.py}-python%{py3_ver}"; do %doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt BUGS.txt docs/* licenses %{_bindir}/rst*-python%{py3_ver} %{python3_sitelib}/* +%if 0%{?suse_version} <= 1140 +%dir %{python3_sitelib} +%endif %changelog From 0b59ecd993bf43fb6cca80ec82e530a6aabafa2a0c11670e6f89e626d22da70e Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 30 Apr 2012 14:30:08 +0000 Subject: [PATCH 5/5] Accepting request 116066 from home:babelworx:ldig:branches:devel:languages:python 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 OBS-URL: https://build.opensuse.org/request/show/116066 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=10 --- python-docutils.changes | 7 +++++++ python-docutils.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/python-docutils.changes b/python-docutils.changes index 92fa4df..9630fc3 100644 --- a/python-docutils.changes +++ b/python-docutils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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/python-docutils.spec b/python-docutils.spec index 946233c..b4a69a4 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -20,7 +20,7 @@ Name: python-docutils Version: 0.8.1 Release: 0 Summary: Python Documentation Utilities -License: Python-2.0, BSD-2-Clause, GPL-2.0+ +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