diff --git a/novnc.changes b/novnc.changes index 0eaf7a0..797d33d 100644 --- a/novnc.changes +++ b/novnc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 2 15:21:40 UTC 2019 - Dirk Mueller + +- require python3-websockify for recent distros (bsc#1119737) + ------------------------------------------------------------------- Wed Jun 20 14:20:37 UTC 2018 - kberger@suse.com diff --git a/novnc.spec b/novnc.spec index c3ff9b6..639aaf0 100644 --- a/novnc.spec +++ b/novnc.spec @@ -1,7 +1,7 @@ # # 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 # 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/ # @@ -20,19 +20,17 @@ Name: novnc Version: 1.0.0 Release: 0 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 - -Url: https://github.com/novnc/noVNC +URL: https://github.com/novnc/noVNC Source0: noVNC-%{version}.tar.gz - Patch1: novnc-0.3-manpage.patch Patch2: novnc-1.0.0-fix-interpreter.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#BuildRequires: python-devel - -Requires: python-websockify +%if 0%{?suse_version} < 1330 +Requires: python2-websockify +%else +Requires: python3-websockify +%endif BuildArch: noarch %description @@ -43,7 +41,7 @@ instances. %prep %setup -q -n noVNC-%{version} %patch1 -p1 -%patch2 -p0 +%patch2 %build @@ -69,10 +67,10 @@ mkdir -p %{buildroot}%{_mandir}/man1/ install -m 444 docs/novnc_server.1 %{buildroot}%{_mandir}/man1/ %files -%defattr(-,root,root,-) -%doc README.md LICENSE.txt +%license LICENSE.txt +%doc README.md %{_bindir}/novnc_server %{_datadir}/novnc/ -%{_mandir}/man1/novnc_server.1* +%{_mandir}/man1/novnc_server.1%{?ext_man} %changelog