[spice-gtk] Fix multilib conflict.
Hans de Goede
jwrdegoede at fedoraproject.org
Thu Mar 8 16:53:30 UTC 2012
commit a124fbdda00c18937e613b43e05516b1644acefb
Author: Hans de Goede <hdegoede at redhat.com>
Date: Thu Mar 8 17:48:52 2012 +0100
Fix multilib conflict.
Apparently rpm does not do elf-coloring for suid root binaries? So lets
just install the helper in a dir with the arch name in there to avoid
multilib conflicts.
spice-gtk.spec | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/spice-gtk.spec b/spice-gtk.spec
index 414d933..6181fec 100644
--- a/spice-gtk.spec
+++ b/spice-gtk.spec
@@ -150,13 +150,13 @@ cp -a spice-gtk-%{version} spice-gtk3-%{version}
%build
cd spice-gtk-%{version}
-%configure --with-gtk=2.0 --enable-gtk-doc --with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk/
+%configure --with-gtk=2.0 --enable-gtk-doc --with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk-%{_arch}/
make %{?_smp_mflags}
cd ..
%if %{with_gtk3}
cd spice-gtk3-%{version}
-%configure --with-gtk=3.0 --enable-vala --with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk/
+%configure --with-gtk=3.0 --enable-vala --with-usb-acl-helper-dir=%{_libexecdir}/spice-gtk-%{_arch}/
make %{?_smp_mflags}
cd ..
%endif
@@ -211,7 +211,7 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
%{_libdir}/libspice-client-glib-2.0.so.*
%{_libdir}/libspice-controller.so.*
%{_libdir}/girepository-1.0/SpiceClientGLib-2.0.typelib
-%{_libexecdir}/spice-gtk/spice-client-glib-usb-acl-helper
+%{_libexecdir}/spice-gtk-%{_arch}/spice-client-glib-usb-acl-helper
%{_datadir}/polkit-1/actions/org.spice-space.lowlevelusbaccess.policy
%files -n spice-glib-devel
More information about the scm-commits
mailing list