[openstack-nova/f21] control spicehtml5proxy on packaging operations

[Pádraig Brady]

commit 2797ff3ac2b5251016736771e66c76fa0099d127
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Oct 20 12:17:23 2014 +0100

    control spicehtml5proxy on packaging operations

 openstack-nova-spicehtml5proxy.init |    6 +++---
 openstack-nova.spec                 |   17 ++++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/openstack-nova-spicehtml5proxy.init b/openstack-nova-spicehtml5proxy.init
index f5f0d28..18a644b 100644
--- a/openstack-nova-spicehtml5proxy.init
+++ b/openstack-nova-spicehtml5proxy.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# openstack-nova-xvpvncproxy  OpenStack Nova Console XVP VNC Proxy
+# openstack-nova-spicehtml5proxy  OpenStack Nova Spice HTML5 Proxy
 #
 # chkconfig:   - 98 02
 # description: OpenStack Nova Spice HTML5 Proxy Server
@@ -10,8 +10,8 @@
 # Required-Start: $remote_fs $network $syslog
 # Required-Stop: $remote_fs $syslog
 # Default-Stop: 0 1 6
-# Short-Description: OpenStack Nova Console XVP VNC Proxy
-# Description: OpenStack Nova Console XVP VNC Proxy Server
+# Short-Description: OpenStack Nova Spice HTML5 Proxy
+# Description: OpenStack Nova Spice HTML5 Server
 ### END INIT INFO
 
 . /etc/rc.d/init.d/functions
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 301b849..0df2389 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -3,7 +3,7 @@
 
 Name:             openstack-nova
 Version:          2014.1.3
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -697,11 +697,11 @@ done
 
 %post console
 %if 0%{?rhel} && 0%{?rhel} <= 6
-for svc in console consoleauth xvpvncproxy; do
+for svc in console consoleauth xvpvncproxy spicehtml5proxy; do
     /sbin/chkconfig --add %{name}-$svc
 done
 %else
-%systemd_post %{name}-console.service %{name}-consoleauth.service %{name}-xvpvncproxy.service
+%systemd_post %{name}-console.service %{name}-consoleauth.service $%{name}-xvpvncproxy.service $%{name}-spicehtml5proxy.service
 %endif
 
 %post cells
@@ -799,13 +799,13 @@ fi
 %preun console
 %if 0%{?rhel} && 0%{?rhel} <= 6
 if [ $1 -eq 0 ] ; then
-    for svc in console consoleauth xvpvncproxy; do
+    for svc in console consoleauth xvpvncproxy spicehtml5proxy; do
         /sbin/service %{name}-${svc} stop >/dev/null 2>&1
         /sbin/chkconfig --del %{name}-${svc}
     done
 fi
 %else
-%systemd_preun %{name}-console.service %{name}-consoleauth.service %{name}-xvpvncproxy.service
+%systemd_preun %{name}-console.service %{name}-consoleauth.service %{name}-xvpvncproxy.service %{name}-spicehtml5proxy.service
 %endif
 
 %preun cells
@@ -921,12 +921,12 @@ fi
 %if 0%{?rhel} && 0%{?rhel} <= 6
 if [ $1 -ge 1 ] ; then
     # package upgrade, not uninstall
-    for svc in console consoleauth xvpvncproxy; do
+    for svc in console consoleauth xvpvncproxy spicehtml5proxy; do
         /sbin/service %{name}-${svc} condrestart > /dev/null 2>&1 || :
     done
 fi
 %else
-%systemd_postun_with_restart %{name}-console.service %{name}-consoleauth.service %{name}-xvpvncproxy.service
+%systemd_postun_with_restart %{name}-console.service %{name}-consoleauth.service $%{name}-xvpvncproxy.service $%{name}-spicehtml5proxy.service
 %endif
 
 %postun cells
@@ -1125,6 +1125,9 @@ fi
 %endif
 
 %changelog
+* Mon Oct 20 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1.3-2
+- Control spicehtml5proxy service on packaging operations
+
 * Fri Oct 17 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1.3-1
 - Update to upstream 2014.1.3