Attachment 591056 Details for Bug 822187 – spec adjustments

[patch] spec adjustments

novnc.spec.diff (text/plain), 3.26 KB, created by Pádraig Brady on 2012-06-12 01:25:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pádraig Brady

Created: 2012-06-12 01:25:16 UTC

Size: 3.26 KB

patch

obsolete

>--- novnc.spec	2012-06-12 00:56:58.000000000 +0000
>+++ /home/padraig/rpmbuild/SPECS/novnc.spec	2012-06-12 01:20:57.188503711 +0000
>@@ -6,8 +6,7 @@
>   sed -ne 's/^\.fc\?$[0-9]\+$.*/%%define fedora \1/p')}
> %endif
> 
>-# Although earlier Fedora has systemd, libvirt still used sysvinit
>-%if 0%{?fedora} >= 17  ||  0%{?rhel} >= 7
>+%if 0%{?fedora} >= 15  ||  0%{?rhel} >= 7
> %define with_systemd 1
> %else
> %define with_systemd 0
>@@ -21,7 +20,7 @@
> 
> License:        GPLv3
> URL:            https://github.com/kanaka/noVNC
>-Source0:        https://github.com/downloads/kanaka/noVNC/noVNC-%{version}.tar.gz  
>+Source0:        https://github.com/downloads/kanaka/noVNC/noVNC-%{version}.tar.gz
> Source1:        openstack-nova-novncproxy.service
> Source2:        openstack-nova-novncproxy.init
> 
>@@ -29,15 +28,15 @@
> Patch0:         novnc-0.3-nova-wsproxy.patch
> Patch1:         novnc-0.3-manpage.patch
> Patch2:         novnc-0.3-call-websockify.patch
>-BuildArch:       noarch
>+BuildArch:      noarch
> BuildRequires:  python2-devel
> 
> %description
> Websocket implementation of VNC client
> 
> 
>-%package  nova-proxy
>-Summary: Python noVNC server that proxies VNC traffic over Websockets
>+%package -n openstack-nova-novncproxy
>+Summary:        Proxy server for noVNC traffic over Websockets
> Requires:       numpy
> Requires:       python-websockify
> 
>@@ -52,8 +51,8 @@
> Requires(preun): initscripts
> %endif
> 
>-%description nova-proxy
>-Nova noVNC server that proxies VNC traffic over Websockets
>+%description -n openstack-nova-novncproxy
>+OpenStack Nova noVNC server that proxies VNC traffic over Websockets
> 
> %prep
> %setup -q
>@@ -66,9 +65,9 @@
> 
> %install
> mkdir -p %{buildroot}/%{_usr}/share/novnc/utils
>-install -m 444  *html %{buildroot}/%{_usr}/share/novnc
>+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
>+install -m 444 vnc.html %{buildroot}/%{_usr}/share/novnc/index.html
> 
> mkdir -p %{buildroot}/%{_usr}/share/novnc/include/
> install -m 444 include/*.*  %{buildroot}/%{_usr}/share/novnc/include
>@@ -93,14 +92,14 @@
> %endif
> 
> 
>-%post nova-proxy
>+%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 nova-proxy
>+%preun -n openstack-nova-novncproxy
> %if %{with_systemd}
> %else
> if [ $1 -eq 0 ] ; then
>@@ -123,7 +122,7 @@
> %{_mandir}/man1/novnc_server.1*
> 
> 
>-%files nova-proxy
>+%files -n openstack-nova-novncproxy
> %{_bindir}/nova-novncproxy
> %{_mandir}/man1/nova-novncproxy.1*
> %if %{with_systemd}
>@@ -134,15 +133,9 @@
> 
> %changelog
> * Mon Jun 11 2012 Adam Young <ayoung@redhat.com> - 0.3-5
>-- systemd script installed non-executable 
>-- fix to system V init script startup parameters
>-
>-
>-* Mon Jun 11 2012 Adam Young <ayoung@redhat.com> - 0.3-4
> - systemd initialization for Nova Proxy
> - system V init script
>-- remove Binary based Falsh support 
>-
>+- remove Binary based Flash support
> 
> * Tue Jun 8 2012 Adam Young <ayoung@redhat.com> - 0.3-3
> - Added man pages
>@@ -156,6 +149,5 @@
> - Added in support for the Nova noVNC proxy
> - Added files for the images and inclues subdirectories
> 
>-
> * Thu May 10 2012 Adam Young <ayoung@redhat.com> - 0.2
> - Initial RPM release.

Actions: View | Diff

Attachments on bug 822187: 591056