From 6b63b96864122a6e00d4ccbe481f464d39e8e8e7156d008e224f808774adabb2 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 13:58:57 +0000 Subject: [PATCH 1/2] Remove superfluous devel dependency for noarch package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-recommonmark?expand=0&rev=9 --- python-recommonmark.changes | 5 +++++ python-recommonmark.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/python-recommonmark.changes b/python-recommonmark.changes index bb2b295..8ba7db9 100644 --- a/python-recommonmark.changes +++ b/python-recommonmark.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 4 12:53:36 UTC 2018 - Matej Cepl + +- Remove superfluous devel dependency for noarch package + ------------------------------------------------------------------- Thu Jul 20 21:24:28 UTC 2017 - sebix+novell.com@sebix.at diff --git a/python-recommonmark.spec b/python-recommonmark.spec index 55489dd..e105aaa 100644 --- a/python-recommonmark.spec +++ b/python-recommonmark.spec @@ -1,7 +1,7 @@ # # spec file for package python-recommonmark # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -30,7 +30,6 @@ Source1: https://raw.githubusercontent.com/rtfd/recommonmark/master/licen # PATCH-FIX-UPSTREAM fix-commonmark-compatibility.patch sebix+novell.com@sebix.at -- fix commonmark renamings Patch0: fix-commonmark-compatibility.patch BuildRequires: %{python_module CommonMark} -BuildRequires: %{python_module devel} BuildRequires: %{python_module docutils} BuildRequires: %{python_module setuptools} BuildRequires: fdupes From 12b63966daddd65ed41cfa8123fa9bdc988caec362c6a5636cf1682221b7bd3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 7 Dec 2018 10:18:17 +0000 Subject: [PATCH 2/2] - Fix the fdupes call OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-recommonmark?expand=0&rev=10 --- python-recommonmark.changes | 5 +++++ python-recommonmark.spec | 21 ++++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/python-recommonmark.changes b/python-recommonmark.changes index 8ba7db9..c4eb0d3 100644 --- a/python-recommonmark.changes +++ b/python-recommonmark.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 7 10:17:42 UTC 2018 - Tomáš Chvátal + +- Fix the fdupes call + ------------------------------------------------------------------- Tue Dec 4 12:53:36 UTC 2018 - Matej Cepl diff --git a/python-recommonmark.spec b/python-recommonmark.spec index e105aaa..e9b7619 100644 --- a/python-recommonmark.spec +++ b/python-recommonmark.spec @@ -24,7 +24,7 @@ Release: 0 Summary: Python docutils-compatibility bridge to CommonMark License: MIT Group: Development/Languages/Python -Url: https://github.com/rtfd/recommonmark +URL: https://github.com/rtfd/recommonmark Source0: https://files.pythonhosted.org/packages/source/r/recommonmark/recommonmark-%{version}.tar.gz Source1: https://raw.githubusercontent.com/rtfd/recommonmark/master/license.md # PATCH-FIX-UPSTREAM fix-commonmark-compatibility.patch sebix+novell.com@sebix.at -- fix commonmark renamings @@ -36,19 +36,15 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-CommonMark Requires: python-docutils +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: python-reCommonMark = %{version} +Obsoletes: python-reCommonMark < %{version} +BuildArch: noarch %ifpython2 Obsoletes: %{oldpython}-reCommonMark < %{version} Provides: %{oldpython}-reCommonMark = %{version} %endif -%ifpython3 -Provides: python3-reCommonMark = %{version} -Obsoletes: python3-reCommonMark < %{version} -%endif -Requires(post): update-alternatives -Requires(preun): update-alternatives -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch - %python_subpackages %description @@ -74,7 +70,7 @@ find recommonmark -name "*.py" | xargs sed -i '1 {/^#!/ d}' %install %python_install -%fdupes %{buildroot}%{_prefix} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/cm2html %python_clone -a %{buildroot}%{_bindir}/cm2latex @@ -90,8 +86,7 @@ find recommonmark -name "*.py" | xargs sed -i '1 {/^#!/ d}' %python_uninstall_alternative cm2man %files %{python_files} -%defattr(-,root,root,-) -%doc license.md +%license license.md %python_alternative %{_bindir}/cm2html %python_alternative %{_bindir}/cm2latex %python_alternative %{_bindir}/cm2man