- require python3-websockify for recent distros (bsc#1119737)

OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/novnc?expand=0&rev=21
This commit is contained in:
Dirk Mueller 2019-01-02 15:26:18 +00:00 committed by Git OBS Bridge
parent a5f96a12c6
commit 93d3bc8c8e
2 changed files with 18 additions and 15 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 2 15:21:40 UTC 2019 - Dirk Mueller <dmueller@suse.com>
- require python3-websockify for recent distros (bsc#1119737)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 20 14:20:37 UTC 2018 - kberger@suse.com Wed Jun 20 14:20:37 UTC 2018 - kberger@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package novnc # spec file for package novnc
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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/
# #
@ -20,19 +20,17 @@ Name: novnc
Version: 1.0.0 Version: 1.0.0
Release: 0 Release: 0
Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support
License: MPL-2.0 and LGPL-3.0 License: MPL-2.0 AND LGPL-3.0-only
Group: System/Daemons Group: System/Daemons
URL: https://github.com/novnc/noVNC
Url: https://github.com/novnc/noVNC
Source0: noVNC-%{version}.tar.gz Source0: noVNC-%{version}.tar.gz
Patch1: novnc-0.3-manpage.patch Patch1: novnc-0.3-manpage.patch
Patch2: novnc-1.0.0-fix-interpreter.patch Patch2: novnc-1.0.0-fix-interpreter.patch
%if 0%{?suse_version} < 1330
BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python2-websockify
#BuildRequires: python-devel %else
Requires: python3-websockify
Requires: python-websockify %endif
BuildArch: noarch BuildArch: noarch
%description %description
@ -43,7 +41,7 @@ instances.
%prep %prep
%setup -q -n noVNC-%{version} %setup -q -n noVNC-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p0 %patch2
%build %build
@ -69,10 +67,10 @@ mkdir -p %{buildroot}%{_mandir}/man1/
install -m 444 docs/novnc_server.1 %{buildroot}%{_mandir}/man1/ install -m 444 docs/novnc_server.1 %{buildroot}%{_mandir}/man1/
%files %files
%defattr(-,root,root,-) %license LICENSE.txt
%doc README.md LICENSE.txt %doc README.md
%{_bindir}/novnc_server %{_bindir}/novnc_server
%{_datadir}/novnc/ %{_datadir}/novnc/
%{_mandir}/man1/novnc_server.1* %{_mandir}/man1/novnc_server.1%{?ext_man}
%changelog %changelog