From 2bd550c8899bf2030d693c4d303913e9307803f7972dce359cbfd5d2b0cf2967 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Tue, 10 Feb 2015 23:57:29 +0000
Subject: [PATCH 1/3] Accepting request 284904 from
home:apersaud:branches:devel:languages:python
added if for <=1110 again, otherwise the same as SR284797 (removed .py file from /usr/bin)
OBS-URL: https://build.opensuse.org/request/show/284904
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-html2text?expand=0&rev=16
---
python-html2text.changes | 6 ++++++
python-html2text.spec | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/python-html2text.changes b/python-html2text.changes
index a340583..a34d440 100644
--- a/python-html2text.changes
+++ b/python-html2text.changes
@@ -1,3 +1,9 @@
+Sun Feb 8 06:16:02 UTC 2015 - arun@gmx.de
+
+- specfile:
+ * update copyright year
+ * removed installation of .py file in /usr/bin
+
-------------------------------------------------------------------
Mon Oct 28 13:19:28 UTC 2013 - speilicke@suse.com
diff --git a/python-html2text.spec b/python-html2text.spec
index 2e9946d..2db8d63 100644
--- a/python-html2text.spec
+++ b/python-html2text.spec
@@ -1,7 +1,7 @@
#
# spec file for package python-html2text
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -47,11 +47,11 @@ python setup.py build
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+rm %{buildroot}%{_bindir}/html2text.py
%files
%defattr(-,root,root,-)
%doc COPYING README.md
-%{_bindir}/html2text.py
%{python_sitelib}/*
%changelog
From 085f34ce27e992d5f62323aa5774653bb2d0b0e43d5bf9b82a97c6371c3ec091 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Tue, 24 Feb 2015 13:22:59 +0000
Subject: [PATCH 2/3] OBS-URL:
https://build.opensuse.org/package/show/devel:languages:python/python-html2text?expand=0&rev=17
---
python-html2text.changes | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/python-html2text.changes b/python-html2text.changes
index a34d440..e4c8b42 100644
--- a/python-html2text.changes
+++ b/python-html2text.changes
@@ -2,8 +2,10 @@ Sun Feb 8 06:16:02 UTC 2015 - arun@gmx.de
- specfile:
* update copyright year
- * removed installation of .py file in /usr/bin
-
+ * removed installation of .py file in /usr/bin; An upstream mistake
+ and a conflict betwenn html2text.py in python_sitelib and in
+ bindir when an external project tries to import it.
+
-------------------------------------------------------------------
Mon Oct 28 13:19:28 UTC 2013 - speilicke@suse.com
From efc2ec03ed61821345c286ec7bece619ca9ee38a24da17f9efa31dc25fb8323a Mon Sep 17 00:00:00 2001
From: Denisart Benjamin
Date: Tue, 24 Feb 2015 13:23:44 +0000
Subject: [PATCH 3/3] OBS-URL:
https://build.opensuse.org/package/show/devel:languages:python/python-html2text?expand=0&rev=18
---
python-html2text.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/python-html2text.spec b/python-html2text.spec
index 2db8d63..75d13d1 100644
--- a/python-html2text.spec
+++ b/python-html2text.spec
@@ -47,6 +47,8 @@ python setup.py build
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+# An upstream mistake. A conflict betwenn html2text.py in python_sitelib
+# and in bindir when an external project tries to import it
rm %{buildroot}%{_bindir}/html2text.py
%files