Hello community, here is the log from the commit of package python-html2text for openSUSE:Factory checked in at 2013-10-29 09:33:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-html2text (Old) and /work/SRC/openSUSE:Factory/.python-html2text.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-html2text" Changes: -------- --- /work/SRC/openSUSE:Factory/python-html2text/python-html2text.changes 2012-02-14 13:10:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-html2text.new/python-html2text.changes 2013-10-29 09:33:39.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Oct 28 13:19:28 UTC 2013 - speili...@suse.com + +- Add html2text-entrypoints.patch: + + Fix entry point colliding with /usr/bin/html2text +- Spec cleanup + +------------------------------------------------------------------- +Thu Oct 24 11:06:38 UTC 2013 - speili...@suse.com + +- Require python-setuptools instead of distribute (upstreams merged) + +------------------------------------------------------------------- Old: ---- html2text-3.200.3.tar.bz2 New: ---- html2text-3.200.3.tar.gz html2text-entrypoints.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-html2text.spec ++++++ --- /var/tmp/diff_new_pack.QvB7X2/_old 2013-10-29 09:33:40.000000000 +0100 +++ /var/tmp/diff_new_pack.QvB7X2/_new 2013-10-29 09:33:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-html2text # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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,12 +11,10 @@ # 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/ # -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-html2text Version: 3.200.3 @@ -25,22 +23,24 @@ Summary: Turn HTML into equivalent Markdown-structured text License: GPL-3.0 Group: Development/Languages/Python -Source: html2text-%{version}.tar.bz2 +Source: https://pypi.python.org/packages/source/h/html2text/html2text-%{version}.tar.gz +# PATCH-FIX-UPSTREAM speili...@suse.com -- https://github.com/aaronsw/html2text/pull/79 +Patch0: html2text-entrypoints.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel -BuildRequires: python-distribute -%if 0%{?suse_version} -%py_requires -%if 0%{?suse_version} > 1110 +BuildRequires: python-setuptools +%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 -%endif %description Turn HTML into equivalent Markdown-structured text. %prep %setup -q -n html2text-%{version} +%patch0 -p1 %build python setup.py build @@ -50,8 +50,8 @@ %files %defattr(-,root,root,-) -%doc COPYING -%{_bindir}/html2text +%doc COPYING README.md +%{_bindir}/html2text.py %{python_sitelib}/* %changelog ++++++ html2text-entrypoints.patch ++++++ >From ed9b7477d24caf5e5afe2a55c399eed2b9863dbd Mon Sep 17 00:00:00 2001 From: Sascha Peilicke <sasc...@gmx.de> Date: Mon, 28 Oct 2013 14:14:51 +0100 Subject: [PATCH] Add ".py" suffix to html2text entrypoint Many distributions (including Gentoo and openSUSE) already ship /usr/bin/html2text as part of the "html2text" package. Therefore the current entry point collides with this system binary. Adding a .py prefix would mean it's installed as /usr/bin/html2text.py which is just working fine. Fixes #42 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dd3d9bc..eddeb92 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ ], entry_points=""" [console_scripts] - html2text=html2text:main + html2text.py=html2text:main """, license='GNU GPL 3', packages=find_packages(), -- 1.8.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
