From c969001cc8df761a1071fc1b8790e652035c7d9e61d98d05adbfd633aaae61f4 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 14:13:54 +0000 Subject: [PATCH 1/2] Remove superfluous devel dependency for noarch package OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=27 --- python-websocket-client.changes | 5 +++++ python-websocket-client.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/python-websocket-client.changes b/python-websocket-client.changes index a475255..75e6f62 100644 --- a/python-websocket-client.changes +++ b/python-websocket-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 4 12:55:59 UTC 2018 - Matej Cepl + +- Remove superfluous devel dependency for noarch package + ------------------------------------------------------------------- Thu Jan 18 09:55:12 UTC 2018 - sebix+novell.com@sebix.at diff --git a/python-websocket-client.spec b/python-websocket-client.spec index 64dd425..83a68d2 100644 --- a/python-websocket-client.spec +++ b/python-websocket-client.spec @@ -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/ # @@ -29,14 +29,13 @@ Name: python-websocket-client Version: 0.46.0 Release: 0 Summary: WebSocket client implementation -License: LGPL-2.1 +License: LGPL-2.1-only Group: Development/Languages/Python Url: https://github.com/liris/websocket-client/releases Source0: https://files.pythonhosted.org/packages/source/w/websocket-client/websocket_client-%{version}.tar.gz # PATCH-FIX-OPENSUSE use_system_cabundle.patch bnc#1076519 Patch0: use_system_cabundle.patch BuildRequires: %ssl_match_hostname -BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} BuildRequires: fdupes From e61fc886656dbd9d771ca29069c58fb4eb30298f05a5a727fc4363275f346669 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 4 Dec 2018 17:25:37 +0000 Subject: [PATCH 2/2] Clean up the SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websocket-client?expand=0&rev=28 --- python-websocket-client.spec | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/python-websocket-client.spec b/python-websocket-client.spec index 83a68d2..3c46fd0 100644 --- a/python-websocket-client.spec +++ b/python-websocket-client.spec @@ -16,14 +16,13 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} # RHEL provides this backport in its own repository %if 0%{?rhel} == 7 %define ssl_match_hostname python-backports-ssl_match_hostname %else %define ssl_match_hostname python-backports.ssl_match_hostname %endif - -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %bcond_without test Name: python-websocket-client Version: 0.46.0 @@ -31,25 +30,24 @@ Release: 0 Summary: WebSocket client implementation License: LGPL-2.1-only Group: Development/Languages/Python -Url: https://github.com/liris/websocket-client/releases -Source0: https://files.pythonhosted.org/packages/source/w/websocket-client/websocket_client-%{version}.tar.gz +URL: https://github.com/liris/websocket-client/releases +Source0: https://files.pythonhosted.org/packages/source/w/websocket_client/websocket_client-%{version}.tar.gz # PATCH-FIX-OPENSUSE use_system_cabundle.patch bnc#1076519 Patch0: use_system_cabundle.patch -BuildRequires: %ssl_match_hostname BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six} +BuildRequires: %{ssl_match_hostname} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-six Requires(post): update-alternatives Requires(postun): update-alternatives -%ifpython2 -Requires: %ssl_match_hostname -%endif Provides: python-websocket-client-test = %{version} Obsoletes: python-websocket-client-test < %{version} BuildArch: noarch - +%ifpython2 +Requires: %{ssl_match_hostname} +%endif %python_subpackages %description @@ -83,8 +81,8 @@ Websocket-client supports only hybi-13. %python_uninstall_alternative wsdump.py %files %{python_files} -%defattr(-,root,root,-) -%doc LICENSE README.rst +%license LICENSE +%doc README.rst %python_alternative %{_bindir}/wsdump.py %{python_sitelib}/websocket/ %{python_sitelib}/websocket_client-%{version}-py*.egg-info