[libvirt] [PATCH] virt-viewer.spec.in: fix build after spice-xpi-client removal

marcandre.lureau@redhat.com posted 1 patch 6 years, 5 months ago
Failed in applying to current master (apply log)
virt-viewer.spec.in | 8 --------
1 file changed, 8 deletions(-)
[libvirt] [PATCH] virt-viewer.spec.in: fix build after spice-xpi-client removal
Posted by marcandre.lureau@redhat.com 6 years, 5 months ago
From: Marc-André Lureau <marcandre.lureau@redhat.com>

This fixes commit 140cb84c2538bf0eab7dea2035dfecc4db74c784, where we
removed the spice-xpi-client-remote-viewer.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 virt-viewer.spec.in | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/virt-viewer.spec.in b/virt-viewer.spec.in
index 44ef92e..54e2121 100644
--- a/virt-viewer.spec.in
+++ b/virt-viewer.spec.in
@@ -89,9 +89,6 @@ autoreconf -if
 %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}/
 %find_lang %{name}
 
 %clean
@@ -100,8 +97,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 +104,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
 
@@ -127,8 +121,6 @@ fi
 %{_datadir}/applications/remote-viewer.desktop
 %{_datadir}/appdata/remote-viewer.appdata.xml
 %{_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.15.0.125.g8f49766d64

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] virt-viewer.spec.in: fix build after spice-xpi-client removal
Posted by Daniel P. Berrange 6 years, 5 months ago
On Thu, Nov 16, 2017 at 06:42:01PM +0100, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> This fixes commit 140cb84c2538bf0eab7dea2035dfecc4db74c784, where we
> removed the spice-xpi-client-remote-viewer.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  virt-viewer.spec.in | 8 --------
>  1 file changed, 8 deletions(-)

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list