As the next release of RHEV/oVirt won't use the activex plugin (spicex)
and as spice-xpi-client-remove-viewer file is not used for anything
else, let's completely remove it from our tree.
Related: rhbz#1324885 and rhbz#1316560
Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
---
data/Makefile.am | 1 -
data/spice-xpi-client-remote-viewer | 6 ------
virt-viewer.spec.in | 7 -------
3 files changed, 14 deletions(-)
delete mode 100644 data/spice-xpi-client-remote-viewer
diff --git a/data/Makefile.am b/data/Makefile.am
index 29887b9..c0297fd 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,6 @@ CLEANFILES =
MANUFACTURER = Virt Manager Project
EXTRA_DIST = \
- spice-xpi-client-remote-viewer \
adwaita-icons-needed.wxi.in \
virt-viewer.wxs.in \
virt-viewer.nsis.in \
diff --git a/data/spice-xpi-client-remote-viewer b/data/spice-xpi-client-remote-viewer
deleted file mode 100644
index 3109c66..0000000
--- a/data/spice-xpi-client-remote-viewer
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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 f3661d2..795739e 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -90,8 +90,6 @@ autoreconf -if
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}/
%find_lang %{name}
%clean
@@ -100,8 +98,6 @@ rm -rf $RPM_BUILD_ROOT
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-%{_sbindir}/update-alternatives --install %{_libexecdir}/spice-xpi-client \
- spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer 25
/usr/bin/update-desktop-database -q %{_datadir}/applications
%postun
@@ -109,7 +105,6 @@ if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
- %{_sbindir}/update-alternatives --remove spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer
fi
/usr/bin/update-desktop-database -q %{_datadir}/applications
@@ -126,8 +121,6 @@ fi
%{_datadir}/icons/hicolor/*/devices/*
%{_datadir}/applications/remote-viewer.desktop
%{_datadir}/mime/packages/virt-viewer-mime.xml
-%ghost %{_libexecdir}/spice-xpi-client
-%{_libexecdir}/spice-xpi-client-remote-viewer
%{_mandir}/man1/virt-viewer.1*
%{_mandir}/man1/remote-viewer.1*
--
2.7.3
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
