| |
@@ -1,15 +1,18 @@
|
| |
Name: novnc
|
| |
- Version: 1.0.0
|
| |
+ Version: 1.1.0
|
| |
Release: 2%{?dist}
|
| |
Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support
|
| |
- Requires: python2-websockify
|
| |
+ Requires: python3-websockify
|
| |
|
| |
License: GPLv3
|
| |
URL: https://github.com/novnc/noVNC
|
| |
Source0: https://github.com/novnc/noVNC/archive/v%{version}.tar.gz
|
| |
|
| |
+ Patch0001: 0001-launch.sh-Check-for-a-local-websockify-directory.patch
|
| |
+
|
| |
BuildArch: noarch
|
| |
- BuildRequires: python2-devel
|
| |
+ BuildRequires: python3-devel
|
| |
+ BuildRequires: /usr/bin/pathfix.py
|
| |
|
| |
%description
|
| |
noVNC is both a HTML VNC client JavaScript library and an application built on
|
| |
@@ -19,36 +22,46 @@
|
| |
%prep
|
| |
%setup -q -n noVNC-%{version}
|
| |
|
| |
- %build
|
| |
+ %patch0001 -p1
|
| |
|
| |
+ # Fix any python shebangs within the novnc codebase
|
| |
+ # https://fedoraproject.org/wiki/Changes/Make_ambiguous_python_shebangs_error
|
| |
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
|
| |
+
|
| |
+ %build
|
| |
|
| |
%install
|
| |
- mkdir -p %{buildroot}/%{_usr}/share/novnc/utils
|
| |
- install -m 444 *html %{buildroot}/%{_usr}/share/novnc
|
| |
- #provide an index file to prevent default directory browsing
|
| |
- install -m 444 vnc.html %{buildroot}/%{_usr}/share/novnc/index.html
|
| |
- mkdir -p %{buildroot}/%{_bindir}
|
| |
- install utils/launch.sh %{buildroot}/%{_bindir}/novnc_server
|
| |
+ mkdir -p %{buildroot}/%{_datadir}/%{name}/
|
| |
+ cp -r * %{buildroot}/%{_datadir}/%{name}/
|
| |
|
| |
- %{__install} -d %{buildroot}%{_sysconfdir}/sysconfig
|
| |
+ # provide an index file to prevent default directory browsing
|
| |
+ install -m 444 vnc.html %{buildroot}/%{_datadir}/%{name}/index.html
|
| |
|
| |
- %post
|
| |
- #symlink the <1.0.0 vnc_auto.html page to the new >=1.0.0 vnc_lite.html page.
|
| |
- ln -s -f %{_usr}/share/novnc/vnc_lite.html %{_usr}/share/novnc/vnc_auto.html
|
| |
+ # install a copy of the new vnc_lite.html page as the old <1.0.0 vnc_auto.html page
|
| |
+ install -m 444 vnc_lite.html %{buildroot}/%{_datadir}/%{name}/vnc_auto.html
|
| |
+
|
| |
+ # FIXME(lyarwood): launch.sh fails to find the installed version of websockify
|
| |
+ # Addressed by https://github.com/novnc/noVNC/pull/1259
|
| |
+ mkdir -p %{buildroot}/%{_bindir}/
|
| |
+ install utils/launch.sh %{buildroot}/%{_bindir}/%{name}_server
|
| |
|
| |
%files
|
| |
%doc README.md LICENSE.txt
|
| |
-
|
| |
- %dir %{_usr}/share/novnc
|
| |
- %{_usr}/share/novnc/*.*
|
| |
- %{_bindir}/novnc_server
|
| |
+ %{_datadir}/%{name}
|
| |
+ %{_bindir}/%{name}_server
|
| |
|
| |
%changelog
|
| |
+ * Tue Jul 16 2019 Lee Yarwood <lyarwood@redhat.com> 1.1.0-2
|
| |
+ - launch.sh: Check for a local websockify directory (rhbz#1706291)
|
| |
+
|
| |
+ * Fri Jul 05 2019 Lee Yarwood <lyarwood@redhat.com> - 1.1.0-1
|
| |
+ - Update to 1.1.0
|
| |
+
|
| |
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
| |
|
| |
* Thu Aug 02 2018 Lee Yarwood <lyarwood@redhat.com> - 1.0.0-1
|
| |
- Update to 1.0.0
|
| |
+ - Update to 1.0.0
|
| |
|
| |
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-6
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
| |
This commit also makes the following changes to ensure noVNC is actually
usable once installed.
novnc requires python3-websockify but RPM is missing the dependency
https://bugzilla.redhat.com/show_bug.cgi?id=1706294
are installed under /usr/share/novnc. Resolving this bug:
[OSP 15] novnc RPM is not packaged with all the required files
https://bugzilla.redhat.com/show_bug.cgi?id=1726312
This is tracked by the following bug:
Can't start novnc using novnc_server script
https://bugzilla.redhat.com/show_bug.cgi?id=1706291
A pull request has also been opened to resolve this below:
launch.sh: Check for a local websockify directory
https://github.com/novnc/noVNC/pull/1259
Convert any python shebangs during %prep.
Install a copy of vnc_lite.html as vnc_auto.html and ensure this is
tracked as part of the package.
Resolves: rhbz#1706294
(cherry picked from commit a16fa3f)