rpms/rhythmbox/FC-6 rhythmbox-0.9.8-magnatune-buy-confirmation.patch, NONE, 1.1 rhythmbox.spec, 1.87, 1.88

[fedora-cvs-commits at redhat.com]

Author: bnocera

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

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.9.8-magnatune-buy-confirmation.patch 
Log Message:
* Wed Mar 28 2007 - Bastien Nocera <bnocera at redhat.com> - 0.9.8-2.fc6
- Add upstream patch for bug 234216


rhythmbox-0.9.8-magnatune-buy-confirmation.patch:
 MagnatuneSource.py |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE rhythmbox-0.9.8-magnatune-buy-confirmation.patch ---
--- branches/RHYTHMBOX-0_10/plugins/magnatune/magnatune/MagnatuneSource.py	2007/02/25 02:52:55	4849
+++ branches/RHYTHMBOX-0_10/plugins/magnatune/magnatune/MagnatuneSource.py	2007/03/02 02:58:10	4876
@@ -196,7 +196,7 @@
 
 			gladexml.get_widget("pay_combobox").set_active(self.__client.get_int(self.__plugin.gconf_keys['pay']) - 5)
 			gladexml.get_widget("audio_combobox").set_active(self.__plugin.format_list.index(self.__client.get_string(self.__plugin.gconf_keys['format'])))
-			gladexml.get_widget("info_label").set_text(_("Would you like to purchase the album '%(album)s' by '%(artist)s'?") % (album, artist))
+			gladexml.get_widget("info_label").set_markup(_("Would you like to purchase the album <i>%(album)s</i> by '%(artist)s'?") % {"album":album, "artist":artist})
 			gladexml.get_widget("remember_cc_details").props.visible = has_gnome_keyring
 
 			try:


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/FC-6/rhythmbox.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- rhythmbox.spec	15 Mar 2007 14:31:34 -0000	1.87
+++ rhythmbox.spec	28 Mar 2007 14:06:19 -0000	1.88
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.9.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -42,6 +42,8 @@
 
 ExcludeArch:    s390 s390x
 
+Patch0: rhythmbox-0.9.8-magnatune-buy-confirmation.patch
+
 %description
 Rhythmbox is an integrated music management application based on the powerful
 GStreamer media framework. It has a number of features, including an easy to
@@ -51,6 +53,8 @@
 %prep
 %setup -q
 
+%patch0 -p2 .magnatune
+
 %build
 
 # work around a gstreamer bug
@@ -64,7 +68,8 @@
       --enable-tag-writing \
       --with-gnome-keyring \
       --with-metadata-helper
-make
+
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -137,6 +142,9 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Wed Mar 28 2007 - Bastien Nocera <bnocera at redhat.com> - 0.9.8-2.fc6
+- Add upstream patch for bug 234216
+
 * Thu Mar 15 2007 - Bastien Nocera <bnocera at redhat.com> - 0.9.8-1.fc6
 - Update to 0.9.8