15
0

- Add html2text-entrypoints.patch:

+ Fix entry point colliding with /usr/bin/html2text
- Spec cleanup

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-html2text?expand=0&rev=14
This commit is contained in:
Sascha Peilicke
2013-10-28 13:19:52 +00:00
committed by Git OBS Bridge
parent 9d68711bed
commit a63bff5b16
5 changed files with 53 additions and 12 deletions

View File

@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c9c92bc5a2a83817d3cc95406d3f4f7947936bcd08fbf65dd6e23bb8fe7a6840
size 19463
oid sha256:0e80a419891a7d1d722eb399898bd6fb4c26419b00ec694ca30def776ba51669
size 19464

3
html2text-3.200.3.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:040a4ace61446ab1e323e71e95e8ce16a5f0cc889027f17974ef8be1391721df
size 21446

View File

@@ -0,0 +1,32 @@
From ed9b7477d24caf5e5afe2a55c399eed2b9863dbd Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <saschpe@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

View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 28 13:19:28 UTC 2013 - speilicke@suse.com
- Add html2text-entrypoints.patch:
+ Fix entry point colliding with /usr/bin/html2text
- Spec cleanup
-------------------------------------------------------------------
Thu Oct 24 11:06:38 UTC 2013 - speilicke@suse.com

View File

@@ -16,9 +16,6 @@
#
%{!?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
Release: 0
@@ -26,22 +23,24 @@ Url: http://www.aaronsw.com/2002/html2text/
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 speilicke@suse.com -- https://github.com/aaronsw/html2text/pull/79
Patch0: html2text-entrypoints.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel
BuildRequires: python-setuptools
%if 0%{?suse_version}
%py_requires
%if 0%{?suse_version} > 1110
%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
@@ -51,8 +50,8 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
%files
%defattr(-,root,root,-)
%doc COPYING
%{_bindir}/html2text
%doc COPYING README.md
%{_bindir}/html2text.py
%{python_sitelib}/*
%changelog