diff --git a/spice-gtk.spec b/spice-gtk.spec index 17595da..69337ef 100644 --- a/spice-gtk.spec +++ b/spice-gtk.spec @@ -7,7 +7,7 @@ Name: spice-gtk Version: 0.25 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A GTK+ widget for SPICE clients Group: System Environment/Libraries @@ -127,7 +127,7 @@ A module allowing use of the spice-gtk-2.0 widget from python %package tools Summary: Spice-gtk tools Group: Applications/Internet -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: spice-gtk3%{?_isa} = %{version}-%{release} %description tools Simple clients for interacting with SPICE servers. @@ -167,16 +167,16 @@ cd .. %install +cd spice-gtk-%{version} +make install DESTDIR=%{buildroot} +cd .. + %if %{with_gtk3} cd spice-gtk3-%{version} make install DESTDIR=%{buildroot} cd .. %endif -cd spice-gtk-%{version} -make install DESTDIR=%{buildroot} -cd .. - rm -f %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/python*/site-packages/*.a @@ -263,6 +263,11 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc %{_bindir}/spicy-stats %changelog +* Wed Sep 24 2014 Christophe Fergeau 0.25-6 +- Run make install in gtk3 build after doing so in gtk2 build, otherwise + we'll end up packaging gtk2 builds of spicy et al in spice-client-tools + instead of gtk3 ones (#1145829) + * Wed Aug 20 2014 Kalev Lember - 0.25-5 - Rebuilt for rpm dependency generator failure (#1131892)