From a124fbdda00c18937e613b43e05516b1644acefb Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 8 Mar 2012 17:48:52 +0100 Subject: [PATCH 1/2] 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 file 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 From 2fbc784a09d9201fd204f3d97e33a60fab84d345 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 9 Mar 2012 14:48:40 +0100 Subject: [PATCH 2/2] New upstream release 0.11 - Fix multilib conflict in spice-glib --- .gitignore | 1 + sources | 2 +- spice-gtk.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c2c8058..258fd48 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /spice-gtk-0.8.tar.bz2 /spice-gtk-0.9.tar.bz2 /spice-gtk-0.10.tar.bz2 +/spice-gtk-0.11.tar.bz2 diff --git a/sources b/sources index dda6a0b..af6db1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5f3e49f3634a229af9b1679540c23019 spice-gtk-0.10.tar.bz2 +c8f2c274ab81e0ac273be5c6490b8603 spice-gtk-0.11.tar.bz2 diff --git a/spice-gtk.spec b/spice-gtk.spec index 6181fec..213c70c 100644 --- a/spice-gtk.spec +++ b/spice-gtk.spec @@ -12,7 +12,7 @@ #define _version_suffix -ab64 Name: spice-gtk -Version: 0.10 +Version: 0.11 Release: 1%{?dist} Summary: A GTK+ widget for SPICE clients @@ -252,6 +252,10 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la %{_bindir}/spicy-stats %changelog +* Fri Mar 9 2012 Hans de Goede - 0.11-1 +- New upstream release 0.11 +- Fix multilib conflict in spice-glib + * Thu Feb 23 2012 Marc-André Lureau - 0.10-1 - New upstream release 0.10