From 554f76fd1c11b0f303d791aae9d66b62a2eae9b45871368fa3dd306b36e2506d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 20 Aug 2020 07:27:17 +0000 Subject: [PATCH] Accepting request 827971 from home:jayvdb:branches:devel:languages:python - Add Conflicts with html2text - Ignore upstream egg-info and regenerate it OBS-URL: https://build.opensuse.org/request/show/827971 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-html2text?expand=0&rev=37 --- python-html2text.changes | 6 ++++++ python-html2text.spec | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/python-html2text.changes b/python-html2text.changes index db0a227..a6c9880 100644 --- a/python-html2text.changes +++ b/python-html2text.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 20 04:47:19 UTC 2020 - John Vandenberg + +- Add Conflicts with html2text +- Ignore upstream egg-info and regenerate it + ------------------------------------------------------------------- Thu Apr 9 11:17:36 UTC 2020 - Marketa Calabkova diff --git a/python-html2text.spec b/python-html2text.spec index 39f7e99..b8823e2 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -33,6 +33,7 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Requires(post): update-alternatives Requires(preun): update-alternatives +Conflicts: html2text BuildArch: noarch %python_subpackages @@ -45,6 +46,9 @@ Markdown (a text-to-HTML format). # remove useless shebang sed -i '/^#!/d' %{upname}/__init__.py +# remove executable bits from egg files +rm -r *.egg-info/ + %build %python_build @@ -54,9 +58,6 @@ sed -i '/^#!/d' %{upname}/__init__.py %python_clone -a %{buildroot}%{_bindir}/%{upname} -# remove executable bits from egg files -%python_expand chmod -x %{buildroot}%{$python_sitelib}/%{upname}-*.egg-info/* - %post %python_install_alternative html2text @@ -73,5 +74,6 @@ export LANG=en_US.UTF-8 %doc README.md AUTHORS.rst ChangeLog.rst %python_alternative %{_bindir}/%{upname} %{python_sitelib}/* +%{python_sitelib}/*.egg-info/ %changelog