[novnc] Remove the nova-novncproxy subpackage
Nikola Dipanov
ndipanov at fedoraproject.org
Mon Jun 24 17:19:59 UTC 2013
commit 2a649ee8f5b491365e46251da6af63325b1ad25b
Author: Nikola Dipanov <ndipanov at redhat.com>
Date: Fri Jun 21 15:50:40 2013 +0200
Remove the nova-novncproxy subpackage
novnc-0.4-manpage.patch | 57 +++-----------------
novnc-0.4-nova-conf-oslo.patch | 34 ------------
novnc-0.4-nova-flags-to-conf.patch | 85 -----------------------------
novnc-0.4-nova-wsproxy.patch | 26 ---------
novnc.spec | 94 ++------------------------------
openstack-nova-novncproxy.init | 102 -----------------------------------
openstack-nova-novncproxy.service | 12 ----
openstack-nova-novncproxy.sysconfig | 2 -
8 files changed, 13 insertions(+), 399 deletions(-)
---
diff --git a/novnc-0.4-manpage.patch b/novnc-0.4-manpage.patch
index 0f93e38..65d35d3 100644
--- a/novnc-0.4-manpage.patch
+++ b/novnc-0.4-manpage.patch
@@ -1,56 +1,13 @@
-From 42d5fa61a47fb156bf4e6bea7051c9198f8fb938 Mon Sep 17 00:00:00 2001
-From: Adam Young <ayoung at redhat.com>
-Date: Fri, 8 Jun 2012 10:34:38 -0400
-Subject: [PATCH] added Man pages.
+From 5d8f42c1d504cd6f70380f6dc53f31bac96dbfd6 Mon Sep 17 00:00:00 2001
+From: Nikola Dipanov <ndipanov at redhat.com>
+Date: Fri, 21 Jun 2013 15:58:48 +0200
+Subject: [PATCH] Add the manpage for the novnc server
---
- docs/nova-novncproxy.1 | 35 +++++++++++++++++++++++++++++++++++
- docs/novnc_server.1 | 22 ++++++++++++++++++++++
- 2 files changed, 57 insertions(+)
- create mode 100644 docs/nova-novncproxy.1
+ docs/novnc_server.1 | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
create mode 100644 docs/novnc_server.1
-diff --git a/docs/nova-novncproxy.1 b/docs/nova-novncproxy.1
-new file mode 100644
-index 0000000..198b634
---- /dev/null
-+++ b/docs/nova-novncproxy.1
-@@ -0,0 +1,35 @@
-+.TH nova-novncproxy 1 "June 8, 2012" "version 0.3" "USER COMMANDS"
-+
-+.SH NAME
-+nova-novncproxy | noVNC proxy for Openstack Nova
-+.SH SYNOPSIS
-+.B nova-novncproxy [options]
-+
-+.SH OPTIONS
-+.TP
-+record : Record sessions to FILE.[session_number]
-+.TP
-+daemon : Become a daemon (background process)
-+.TP
-+ssl_only : Disallow non-encrypted connections'),
-+.TP
-+source_is_ipv6 : Source is ipv6
-+.TP
-+cert : SSL certificate file
-+.TP
-+key : SSL key file (if separate from cert)
-+.TP
-+web : Run webserver on same port. Serve files from DIR.
-+.TP
-+novncproxy_host : Host on which to listen for incoming requests.
-+ defaults to ='0.0.0.0'
-+.TP
-+novncproxy_port: Port on which to listen for incoming requests
-+ defaults to 6080
-+
-+
-+.SH AUTHOR
-+Joel Martin (github at martintribe.org)
-+
-+.SH SEE ALSO
-+websockify(1)
diff --git a/docs/novnc_server.1 b/docs/novnc_server.1
new file mode 100644
index 0000000..5bcbd1b
@@ -80,5 +37,5 @@ index 0000000..5bcbd1b
+.SH SEE ALSO
+websockify(1)
--
-1.7.10.2
+1.7.9.5
diff --git a/novnc.spec b/novnc.spec
index 498644c..677c2f9 100644
--- a/novnc.spec
+++ b/novnc.spec
@@ -1,71 +1,25 @@
-# If neither fedora nor rhel was defined, try to guess them from %%{dist}
-%if !0%{?rhel} && !0%{?fedora}
-%{expand:%(echo "%{?dist}" | \
- sed -ne 's/^\.el\([0-9]\+\).*/%%define rhel \1/p')}
-%{expand:%(echo "%{?dist}" | \
- sed -ne 's/^\.fc\?\([0-9]\+\).*/%%define fedora \1/p')}
-%endif
-
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-%define with_systemd 1
-%else
-%define with_systemd 0
-%define _initdir /etc/rc.d/init.d
-%endif
-
Name: novnc
Version: 0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: VNC client using HTML5 (Web Sockets, Canvas) with encryption support
Requires: python-websockify
License: GPLv3
URL: https://github.com/kanaka/noVNC
Source0: https://github.com/downloads/kanaka/noVNC/novnc-%{version}.tar.gz
-Source1: openstack-nova-novncproxy.service
-Source2: openstack-nova-novncproxy.init
-Source3: openstack-nova-novncproxy.sysconfig
-
-Patch1: novnc-0.4-manpage.patch
-Patch2: novnc-0.4-call-websockify.patch
-Patch3: novnc-0.4-nova-flags-to-conf.patch
-Patch4: novnc-0.4-nova-conf-oslo.patch
-Patch100: novnc-0.4-nova-wsproxy.patch
+Patch1: novnc-0.4-call-websockify.patch
+Patch2: novnc-0.4-manpage.patch
BuildArch: noarch
BuildRequires: python2-devel
%description
Websocket implementation of VNC client
-
-%package -n openstack-nova-novncproxy
-Summary: Proxy server for noVNC traffic over Websockets
-Requires: novnc
-Requires: openstack-nova-common
-Requires: python-websockify
-
-%if %{with_systemd}
-Requires(post): systemd-units
-Requires(post): systemd-sysv
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%else
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-%endif
-
-%description -n openstack-nova-novncproxy
-OpenStack Nova noVNC server that proxies VNC traffic over Websockets
-
%prep
%setup -q
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch100 -p1
%build
@@ -84,39 +38,10 @@ install -m 444 images/*.* %{buildroot}/%{_usr}/share/novnc/images
mkdir -p %{buildroot}/%{_bindir}
install utils/launch.sh %{buildroot}/%{_bindir}/novnc_server
-install utils/nova-novncproxy %{buildroot}/%{_bindir}
-
mkdir -p %{buildroot}%{_mandir}/man1/
install -m 444 docs/novnc_server.1 %{buildroot}%{_mandir}/man1/
-%if %{with_systemd}
-mkdir -p %{buildroot}%{_unitdir}
-install -p -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}
-%else
-mkdir -p %{buildroot}%{_initddir}
-install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initddir}/openstack-nova-novncproxy
-%endif
-
%{__install} -d %{buildroot}%{_sysconfdir}/sysconfig
-%{__install} -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/openstack-nova-novncproxy
-
-
-%post -n openstack-nova-novncproxy
-%if %{with_systemd}
-%else
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add openstack-nova-novncproxy
-%endif
-
-%preun -n openstack-nova-novncproxy
-%if %{with_systemd}
-%else
-if [ $1 -eq 0 ] ; then
- /sbin/service openstack-nova-novncproxy stop >/dev/null 2>&1
- /sbin/chkconfig --del openstack-nova-novncproxy
-fi
-%endif
-
%files
%doc README.md LICENSE.txt
@@ -130,17 +55,10 @@ fi
%{_bindir}/novnc_server
%{_mandir}/man1/novnc_server.1*
-
-%files -n openstack-nova-novncproxy
-%{_bindir}/nova-novncproxy
-%{_sysconfdir}/sysconfig/openstack-nova-novncproxy
-%if %{with_systemd}
-%{_unitdir}/openstack-nova-novncproxy.service
-%else
-%{_initdir}/openstack-nova-novncproxy
-%endif
-
%changelog
+* Mon Jun 24 2013 Nikola Đipanov <ndipanov at redhat.com> - 0.4-7
+- Remove the openstack-nova-novncproxy subpackage (moved to openstack-nova)
+
* Mon Apr 08 2013 Nikola Đipanov <ndipanov at redhat.com> - 0.4-6
- Import config module from oslo in nova-novncproxy
More information about the scm-commits
mailing list