From 8351444ef2385ca1e3ac43770ac5af539d9aff6b Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Dec 12 2011 07:55:13 +0000 Subject: Merge branch 'master' into f16 --- diff --git a/banshee.spec b/banshee.spec index fe995eb..996b9a6 100644 --- a/banshee.spec +++ b/banshee.spec @@ -6,7 +6,7 @@ Name: banshee Version: 2.2.1 #Release: 0%{gitdate}git%{?dist} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -27,7 +27,7 @@ Source1: README.Fedora Patch1: banshee-2.2.1-CS0266.patch # Mono only available on these: -ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x +ExclusiveArch: %{mono_arches} # Versioned dependencies BuildRequires: libmusicbrainz-devel >= 2.1.1 @@ -89,10 +89,10 @@ Requires: shared-mime-info Requires: gstreamer-plugins-good %ifnarch s390 s390x Requires: libgpod-sharp >= 0.8.2 +Requires: gvfs-afc %endif Requires: gio-sharp gtk-sharp-beans Requires: %{name}-musicbrainz = %{version}-%{release} -Requires: gvfs-afc Requires: media-player-info %description @@ -257,6 +257,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/dbus-1/services/com.meego.* %changelog +* Sun Dec 11 2011 Dan Horák - 2.2.1-2 +- fix Requires on s390(x) +- switch to a macro for the list of Mono arches + * Thu Nov 17 2011 Christian Krause - 2.2.1-1 - Update to 2.2.1 - Comment out snapshot-only buildreqs