[banshee] Update to 2.2.1 Comment out snapshot-only buildreqs Switch from ndesk dbus stuff to dbus-sharp Add r

Christian Krause chkr at fedoraproject.org
Thu Nov 17 17:34:18 UTC 2011


commit 486d5f3f6ddb327b4f26e1bde896b2be8a727770
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Thu Nov 17 18:34:13 2011 +0100

    Update to 2.2.1
    Comment out snapshot-only buildreqs
    Switch from ndesk dbus stuff to dbus-sharp
    Add requires on media-player-info
    Add patch to fix compiling with newer versions of libgpod-sharp
    Bump required version of libgpod-sharp-devel to 0.8.2
    Disable clutter due to a compile issue - according to upstream
    the clutter support is currently not functional:
    https://bugzilla.gnome.org/show_bug.cgi?id=620073

 .gitignore                 |    1 +
 banshee-2.2.1-CS0266.patch |   11 +++++++++++
 banshee.spec               |   37 ++++++++++++++++++++++++++-----------
 sources                    |    2 +-
 4 files changed, 39 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0facfff..9ea82a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ banshee-1-1.7.4.tar.bz2
 /banshee-2.0.0.tar.bz2
 /banshee-2.0.1.tar.bz2
 /banshee-2.2.0.tar.xz
+/banshee-2.2.1.tar.xz
diff --git a/banshee-2.2.1-CS0266.patch b/banshee-2.2.1-CS0266.patch
new file mode 100644
index 0000000..c9d00d6
--- /dev/null
+++ b/banshee-2.2.1-CS0266.patch
@@ -0,0 +1,11 @@
+--- banshee-2.2.1/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs.orig	2011-08-19 06:05:26.000000000 +0800
++++ banshee-2.2.1/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs	2011-11-13 14:47:21.677199408 +0800
+@@ -215,7 +215,7 @@
+             track.CDs = DiscCount;
+             track.CDNumber = DiscNumber;
+             track.TrackLength = (int) Duration.TotalMilliseconds;
+-            track.Size = (int)FileSize;
++            track.Size = (uint)FileSize;
+             track.Grouping = Grouping;
+             try {
+                 track.TimePlayed = LastPlayed;
diff --git a/banshee.spec b/banshee.spec
index 10c6663..4a23229 100644
--- a/banshee.spec
+++ b/banshee.spec
@@ -4,7 +4,7 @@
 #%global gitcommit 8e29a44269cd4b2a27822e62815f5bc6e22dfb58
 
 Name:    banshee
-Version: 2.2.0
+Version: 2.2.1
 #Release: 0%{gitdate}git%{?dist}
 Release: 1%{?dist}
 Summary: Easily import, manage, and play selections from your music collection
@@ -16,12 +16,15 @@ URL:     http://banshee.fm/
 # based on libdrm's make-git-snapshot.sh 
 # sh banshee-make-git-snapshot.sh <gitcommit> <gitdate>
 #Source0: %{name}-%{gitdate}.tar.bz2
-Source0: http://download.banshee-project.org/banshee/stable/%{version}/banshee-%{version}.tar.xz
+Source0: http://ftp.gnome.org/pub/GNOME/sources/banshee/2.2/banshee-%{version}.tar.xz
 Source1: README.Fedora
 #Source2: %{name}-make-git-snapshot.sh
 
 # for snapshots only: don't run configure at the end of autogen.sh
 #Patch0:  %{name}-noconf.patch
+# Fixes a compile error with newer versions of libgpod-sharp
+# https://bugzilla.gnome.org/show_bug.cgi?id=655660
+Patch1: banshee-2.2.1-CS0266.patch
 
 # Mono only available on these:
 ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
@@ -47,15 +50,17 @@ BuildRequires: gkeyfile-sharp-devel gudev-sharp-devel
 BuildRequires: gtk-sharp2-devel taglib-sharp-devel
 BuildRequires: gnome-sharp-devel notify-sharp-devel
 %ifnarch s390 s390x
-BuildRequires: libgpod-sharp-devel >= 0.7.95
+BuildRequires: libgpod-sharp-devel >= 0.8.2
 %endif
 BuildRequires: gdata-sharp-devel
+BuildRequires: dbus-sharp-devel >= 1:0.7.0
+BuildRequires: dbus-sharp-glib-devel
 
 # Extra mono deps
 BuildRequires: mono-data mono-data-sqlite mono-addins-devel
 
 # Gnome/Glib
-BuildRequires: gnome-desktop-devel ndesk-dbus-glib-devel
+BuildRequires: gnome-desktop-devel
 
 # X
 BuildRequires: libXxf86vm-devel
@@ -74,24 +79,21 @@ BuildRequires: gnome-doc-utils gettext-devel intltool perl(XML::Parser)
 #BuildRequires: mono-nunit-devel
 
 #BuildRequires: monotorrent-dbus-devel
-%if %{?fedora} >= 12
-# needs clutter >= 0.9.3; F-11 has 0.8.8
-BuildRequires: clutter-devel
-%endif # F-12 and up
 
 BuildRequires: desktop-file-utils
 
 # Snapshots only
-BuildRequires: autoconf automake libtool
+# BuildRequires: autoconf automake libtool
 
 Requires:      shared-mime-info
 Requires:      gstreamer-plugins-good
 %ifnarch s390 s390x
-Requires:      libgpod-sharp >= 0.7.95
+Requires:      libgpod-sharp >= 0.8.2
 %endif
 Requires:      gio-sharp gtk-sharp-beans
 Requires:      %{name}-musicbrainz = %{version}-%{release}
 Requires:      gvfs-afc
+Requires:      media-player-info
 
 %description
 Banshee allows you to import CDs, sync your music collection to an iPod,
@@ -154,6 +156,7 @@ and play queue sources.
 #%setup -q -n %{name}-%{gitdate}
 # Snapshots only
 #%patch0 -p1 -b .noconf
+%patch1 -p1 -b .typecast
 cp -p %{SOURCE1} .
 
 %build
@@ -170,7 +173,8 @@ export MONO_SHARED_DIR=%mono_shared
 %ifarch s390 s390x
             --disable-appledevice \
 %endif
-            --with-vendor-build-id=Fedora%{?fedora}-%{version}-%{release}
+            --with-vendor-build-id=Fedora%{?fedora}-%{version}-%{release} \
+	    --disable-boo --enable-meego --disable-clutter
 
 make %{?_smp_mflags} V=1
 
@@ -253,6 +257,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/dbus-1/services/com.meego.*
 
 %changelog
+* Thu Nov 17 2011 Christian Krause <chkr at fedoraproject.org> - 2.2.1-1
+- Update to 2.2.1
+- Comment out snapshot-only buildreqs
+- Switch from ndesk dbus stuff to dbus-sharp
+- Add requires on media-player-info
+- Add patch to fix compiling with newer versions of libgpod-sharp
+- Bump required version of libgpod-sharp-devel to 0.8.2
+- Disable clutter due to a compile issue - according to upstream
+  the clutter support is currently not functional:
+  https://bugzilla.gnome.org/show_bug.cgi?id=620073
+
 * Wed Sep 28 2011 Ray <rstrode at redhat.com> - 2.2.0-1
 - Update to 2.2.0
 
diff --git a/sources b/sources
index 1f3f726..9d0eccc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-096813269a190011a345fa8aae15c3f4  banshee-2.2.0.tar.xz
+d682f5c1f64a183123562ad1d6c58b5c  banshee-2.2.1.tar.xz


More information about the scm-commits mailing list