diff --git a/banshee.spec b/banshee.spec index c2c29b2..252e3ae 100644 --- a/banshee.spec +++ b/banshee.spec @@ -73,10 +73,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, @@ -86,6 +86,7 @@ library, and create audio and MP3 CDs from subsets of your library. %package devel Summary: Development files for Banshee Requires: %{name} = %{version}-%{release} +Obsoletes: banshee-musicbrainz-devel < 2.6.2 %description devel Banshee allows you to import CDs, sync your music collection to an iPod, @@ -95,30 +96,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 -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 -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 %patch2 -p1 -b .gst1 @@ -177,7 +154,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 @@ -188,18 +164,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 - 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 - 2.6.1-2