On Tue, Apr 26, 2016 at 04:16:40PM +0200, Fabiano Fidêncio wrote:
> 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.
Commit log is wrong, spice-xpi-client-remote-viewer is about the Mozilla
NPAPI plugin, not about activex.
>
> 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
We probably want to try to do some cleanup on upgrades as before there
was an alternative installed, and now we stopped shipping the files it
needs? We should also add some conflict on the spice-xpi plugin as it's
not going to work with this .spec file.
However, my feeling is that it's too early to do that, let's first wait
for oVirt to be released without support for this, and then if all goes
well, drop it from upstream at a later point. Actually I'd even wait
until the latest oVirt release with plugin support becomes unsupported
before merging that.
Christophe
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list
