diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-02-06 14:22:42 +0000 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2012-02-06 14:22:42 +0000 |
| commit | 0e40961d49634e53fe21a69aa225217c13c6a6b8 (patch) | |
| tree | c623d5a2bd649cee1c0dc74b4d7151d47bfd6a54 | |
| parent | 0cb4fe4972a8fa3859ce51489fe205b2a99db1bf (diff) | |
Add spice-xpi-client-remote-viewer alternative
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | data/spice-xpi-client-remote-viewer | 6 | ||||
| -rw-r--r-- | virt-viewer.spec.in | 16 |
3 files changed, 23 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index cebd2bc..50c9571 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,6 @@ NULL= EXTRA_DIST = \ + spice-xpi-client-remote-viewer \ virt-viewer.nsis.in \ $(NULL) diff --git a/data/spice-xpi-client-remote-viewer b/data/spice-xpi-client-remote-viewer new file mode 100644 index 0000000..3109c66 --- /dev/null +++ b/data/spice-xpi-client-remote-viewer @@ -0,0 +1,6 @@ +#!/bin/sh + +logger -t spice "starting remote-viewer --spice-controller $@..." +env | logger -t spice +exec remote-viewer --spice-controller "$@" 2>&1 | logger -t spice +logger -t spice "remote-viewer execution failed" diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in index dacea5d..f10fe9d 100644 --- a/virt-viewer.spec.in +++ b/virt-viewer.spec.in @@ -29,6 +29,8 @@ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openssh-clients +Requires(post): %{_sbindir}/update-alternatives +Requires(postun): %{_sbindir}/update-alternatives %if %{with_gtk3} BuildRequires: gtk3-devel >= 3.0.0 @@ -109,6 +111,9 @@ browsers. %install rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p %{buildroot}%{_libexecdir} +touch %{buildroot}%{_libexecdir}/spice-xpi-client +install -m 0755 data/spice-xpi-client-remote-viewer %{buildroot}%{_libexecdir}/ %if %{_with_plugin} rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.a rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la @@ -118,6 +123,15 @@ rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la %clean rm -rf $RPM_BUILD_ROOT +%post +%{_sbindir}/update-alternatives --install %{_libexecdir}/spice-xpi-client \ + spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer 20 + +%postun +if [ $1 -eq 0 ] ; then + %{_sbindir}/update-alternatives --remove spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer +fi + %files -f %{name}.lang %defattr(-,root,root,-) %doc README COPYING AUTHORS ChangeLog NEWS @@ -128,6 +142,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/ui/virt-viewer.xml %{_datadir}/%{name}/ui/virt-viewer-auth.xml %{_datadir}/%{name}/ui/virt-viewer-about.xml +%ghost %{_libexecdir}/spice-xpi-client +%{_libexecdir}/spice-xpi-client-remote-viewer %{_mandir}/man1/virt-viewer.1* %{_mandir}/man1/remote-viewer.1* |