From bba7fbad9e4e08e897d8a86df20aefd67e688004 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Oct 10 2009 16:17:06 +0000 Subject: - Disable parallel make due to multilib conflicts. --- diff --git a/exo.spec b/exo.spec index 7fb4a99..fd9f47e 100644 --- a/exo.spec +++ b/exo.spec @@ -3,7 +3,7 @@ Summary: Application library for the Xfce desktop environment Name: exo Version: 0.3.103 -Release: 1%{?dist} +Release: 2%{?dist} # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+ # everything else is LGPLv2+ License: LGPLv2+ and GPLv2+ @@ -57,7 +57,8 @@ Python libraries and header files for the exo library. %build %configure --enable-gtk-doc --disable-static -make %{?_smp_mflags} +# using %{?_smp_mflags} causes a multilib conflict, disable it for now +make %install rm -rf $RPM_BUILD_ROOT @@ -134,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{python_sitearch}/pyexo.* %changelog +* Sat Oct 10 2009 Christoph Wickert - 0.3.103-2 +- Disable parallel make due to multilib conflicts. + * Sat Oct 10 2009 Christoph Wickert - 0.3.103-1 - Update to 0.3.103 - Drop patches for URL quoting and default mount options (fixed upstream)