rpms/rhythmbox/devel rhythmbox-iradio-initial.pls, NONE, 1.1 rhythmbox.spec, 1.108, 1.109

[fedora-cvs-commits at redhat.com]

Author: bnocera

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11588

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-iradio-initial.pls 
Log Message:
* Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-4.fc7
- Provide some quality Ogg radios in the default iRadio catalogue
  (#229677)



--- NEW FILE rhythmbox-iradio-initial.pls ---
[playlist]

# http://www.wknc.org/listen.php
file1=http://wknc.org:8000/wknclq.ogg.m3u
title1=WKNC 88.1 FM (NC State) (Modem)
genre1=Music

file2=http://wknc.org:8000/wkncmq.ogg.m3u
title2=WKNC 88.1 FM (NC State) (Broadband)
genre2=Music

# http://www.virginradio.co.uk/listen/
file3=http://www.smgradio.com/core/audio/ogg/live.pls?service=vr
title3=Virgin Radio UK (Modem)
genre3=Pop

file4=http://www.smgradio.com/core/audio/ogg/live.pls?service=vrbb
title4=Virgin Radio UK (Broadband)
genre4=Pop

# http://xtreme.virginradio.co.uk/thestation/listen/index.html
file5=http://www.smgradio.com/core/audio/ogg/live.pls?service=vx
title5=Virgin Xtreme (Modem)
genre5=Modern Rock

file6=http://www.smgradio.com/core/audio/ogg/live.pls?service=vxbb
title6=Virgin Xtreme (Broadband)
genre6=Modern Rock

# http://classicrock.virginradio.co.uk/thestation/listen/index.html
file7=http://www.smgradio.com/core/audio/ogg/live.pls?service=vc
title7=Virgin Classic Rock (Modem)
genre7=Rock'n'Roll

file8=http://www.smgradio.com/core/audio/ogg/live.pls?service=vcbb
title8=Virgin Classic Rock (Broadband)
genre8=Rock'n'Roll

# http://www.cbc.ca/listen/ogg.html
file9=http://www.cbc.ca/livemedia/cbcr1-toronto.m3u
title9=CBC Radio One (Canada)
genre9=General

file10=http://www.cbc.ca/livemedia/cbcr2-toronto.m3u
title10=CBC Radio Two (Canada)
genre10=General

# http://www.nrk.no/lyd/
file11=http://media.hiof.no/streams/m3u/nrk-p1-172.ogg.m3u
title11=NRK P1 (Norway)
genre11=General

file12=http://media.hiof.no/streams/m3u/nrk-p2-172.ogg.m3u
title12=NRK P2 (Norway)
genre12=General

file13=http://media.hiof.no/streams/m3u/nrk-petre-172.ogg.m3u
title13=NRK P3 (Norway)
genre13=General

file14=http://media.hiof.no/streams/m3u/nrk-alltid-nyheter-172.ogg.m3u
title14=NRK Alltid Nyheter (Norway)
genre14=

file15=http://media.hiof.no/streams/m3u/nrk-mpetre-172.ogg.m3u
title15=NRK mP3 (Norway)
genre15=

file16=http://media.hiof.no/streams/m3u/nrk-alltid-klassisk-172.ogg.m3u
title16=NRK Alltid Klassisk (Norway)
genre16=

file17=http://media.hiof.no/streams/m3u/nrk-stortinget-172.ogg.m3u
title17=NRK Stortinget (Norway)
genre17=



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- rhythmbox.spec	11 Apr 2007 10:21:29 -0000	1.108
+++ rhythmbox.spec	11 Apr 2007 15:23:07 -0000	1.109
@@ -3,11 +3,12 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.9/%{name}-%{version}.tar.bz2
+Source1: rhythmbox-iradio-initial.pls
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: gtk2 >= 2.4.0
 Requires: libgnomeui >= 2.6.0
@@ -85,9 +86,8 @@
 
 %find_lang %name
 
-# Default internet radio stations use mp3
-rm %{buildroot}%{_libdir}/rhythmbox/plugins/iradio/iradio-initial.pls
-touch %{buildroot}%{_libdir}/rhythmbox/plugins/iradio/iradio-initial.pls
+# Replace the default radios with Ogg Radios
+cp -a %{SOURCE1} %{buildroot}%{_libdir}/rhythmbox/plugins/iradio/iradio-initial.pls
 
 # Don't package api docs
 rm -rf %{buildroot}/%{_datadir}/gtk-doc/
@@ -144,6 +144,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-4.fc7
+- Provide some quality Ogg radios in the default iRadio catalogue
+  (#229677)
+
 * Wed Apr 11 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.0-3.fc7
 - Add requires for gnome-themes, spotted by Nigel Jones (#235818)