[banshee/f20] Fold banshee-musicbrainz into the main package

[Kalev Lember]

commit f9f54fbd5b796152a565d8ea9993162290fccb28
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Mar 9 10:44:53 2014 +0100

    Fold banshee-musicbrainz into the main package
    
    Nothing besides Banshee itself uses banshee-musicbrainz, so it makes
    sense to ship them together in a single package.

 banshee.spec |   38 +++-----------------------------------
 1 files changed, 3 insertions(+), 35 deletions(-)
---
diff --git a/banshee.spec b/banshee.spec
index 8723e1c..268abff 100644
--- a/banshee.spec
+++ b/banshee.spec
@@ -98,10 +98,10 @@ Requires:      libgpod-sharp >= 0.8.2
 Requires:      gvfs-afc
 %endif
 Requires:      gio-sharp gtk-sharp-beans
-Requires:      %{name}-musicbrainz = %{version}-%{release}
 Requires:      media-player-info
 
 Obsoletes: banshee-meego < 2.2.1-4
+Obsoletes: banshee-musicbrainz < 2.6.2
 
 %description
 Banshee allows you to import CDs, sync your music collection to an iPod,
@@ -113,6 +113,7 @@ Summary:        Development files for Banshee
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
+Obsoletes:      banshee-musicbrainz-devel < 2.6.2
 
 %description devel
 Banshee allows you to import CDs, sync your music collection to an iPod,
@@ -122,32 +123,6 @@ library, and create audio and MP3 CDs from subsets of your library.
 The %{name}-devel package contains libraries and header files for
 developing extensions for %{name}.
 
-%package        musicbrainz
-Summary:        MusicBrainz libraries for the Banshee Media Framework
-Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
-%description    musicbrainz
-Banshee allows you to import CDs, sync your music collection to an iPod,
-play music directly from an iPod, create playlists with songs from your
-library, and create audio and MP3 CDs from subsets of your library.
-
-The %{name}-musicbrainz package contains the MusicBrainz library shipped
-with the Banshee music player.
-
-%package        musicbrainz-devel
-Summary:        Development files for %{name}-musicbrainz
-Group:          Development/Libraries
-Requires:       %{name}-musicbrainz = %{version}-%{release}
-Requires:       pkgconfig
-
-%description    musicbrainz-devel
-Banshee allows you to import CDs, sync your music collection to an iPod,
-play music directly from an iPod, create playlists with songs from your
-library, and create audio and MP3 CDs from subsets of your library.
-
-The %{name}-musicbrainz-devel package contains header files for
-developing applications that use %{name}-musicbrainz.
-
 %prep
 %setup -q
 #%setup -q -n %{name}-%{gitdate}
@@ -220,7 +195,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/banshee
 %{_bindir}/muinshee
 %{_bindir}/bamz
-%exclude %{_libdir}/banshee/MusicBrainz.dll*
 %{_libdir}/banshee
 %{_datadir}/appdata/banshee.appdata.xml
 %{_datadir}/applications/*.desktop
@@ -232,18 +206,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/mime/packages/*
 
 %files devel
-%exclude %{_libdir}/pkgconfig/banshee-musicbrainz.pc
 %{_libdir}/pkgconfig/banshee-*.pc
 
-%files musicbrainz
-%{_libdir}/banshee/MusicBrainz.dll*
-
-%files musicbrainz-devel
-%{_libdir}/pkgconfig/banshee-musicbrainz.pc
-
 %changelog
 * Sun Mar 09 2014 Kalev Lember <kalevlember at gmail.com> - 2.6.2-1
 - Update to 2.6.2
+- Fold banshee-musicbrainz into the main package
 - Add two more GStreamer 1.0 patches from Debian
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.1-2