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.
This commit is contained in:
parent
fb960005e9
commit
a124fbdda0
@ -150,13 +150,13 @@ cp -a spice-gtk-%{version} spice-gtk3-%{version}
|
|||||||
%build
|
%build
|
||||||
|
|
||||||
cd spice-gtk-%{version}
|
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}
|
make %{?_smp_mflags}
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
%if %{with_gtk3}
|
%if %{with_gtk3}
|
||||||
cd spice-gtk3-%{version}
|
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}
|
make %{?_smp_mflags}
|
||||||
cd ..
|
cd ..
|
||||||
%endif
|
%endif
|
||||||
@ -211,7 +211,7 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
|
|||||||
%{_libdir}/libspice-client-glib-2.0.so.*
|
%{_libdir}/libspice-client-glib-2.0.so.*
|
||||||
%{_libdir}/libspice-controller.so.*
|
%{_libdir}/libspice-controller.so.*
|
||||||
%{_libdir}/girepository-1.0/SpiceClientGLib-2.0.typelib
|
%{_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
|
%{_datadir}/polkit-1/actions/org.spice-space.lowlevelusbaccess.policy
|
||||||
|
|
||||||
%files -n spice-glib-devel
|
%files -n spice-glib-devel
|
||||||
|
Loading…
Reference in New Issue
Block a user