rpms/rhythmbox/F-7 rhythmbox-0.10.1-fix-metadata-trailing-space.patch, NONE, 1.1 rhythmbox.spec, 1.117, 1.118

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31996

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.10.1-fix-metadata-trailing-space.patch 
Log Message:
* Tue Oct 30 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-5.fc7
- Add patch to fix problems with metadata loss when it has a space at the
  end of it (#357951)


rhythmbox-0.10.1-fix-metadata-trailing-space.patch:

--- NEW FILE rhythmbox-0.10.1-fix-metadata-trailing-space.patch ---
--- branches/RHYTHMBOX-0_10/metadata/rb-metadata-gst.c	2007/04/21 13:16:42	5054
+++ branches/RHYTHMBOX-0_10/metadata/rb-metadata-gst.c	2007/06/03 02:20:08	5146
@@ -665,7 +665,6 @@
 		 * and then remove leading and trailing whitespace.
 		 */
 		char *str;
-		const char *old_str;
 
 		str = g_value_dup_string (newval);
 
@@ -680,15 +679,20 @@
 
 		/* Check whether we have a shorter duplicate tag,
 		 * Doesn't work with non-normalised UTF-8 strings */
-		old_str = g_value_get_string (val);
-		if (old_str != NULL
-		    && g_utf8_strlen (old_str, -1) > g_utf8_strlen (str, -1)) {
-			if (g_str_has_prefix (old_str, str) != FALSE) {
-				rb_debug ("Got shorter duplicate tag");
-				g_free (str);
-				g_value_unset (newval);
-				g_free (newval);
-				return;
+		val = g_hash_table_lookup (md->priv->metadata,
+					   GINT_TO_POINTER (field));
+		if (val != NULL) {
+			const char *old_str;
+			old_str = g_value_get_string (val);
+			if (old_str != NULL
+			    && g_utf8_strlen (old_str, -1) > g_utf8_strlen (str, -1)) {
+				if (g_str_has_prefix (old_str, str) != FALSE) {
+					rb_debug ("Got shorter duplicate tag");
+					g_free (str);
+					g_value_unset (newval);
+					g_free (newval);
+					return;
+				}
 			}
 		}
 		g_value_take_string (newval, str);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-7/rhythmbox.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- rhythmbox.spec	29 Oct 2007 13:18:33 -0000	1.117
+++ rhythmbox.spec	30 Oct 2007 17:31:47 -0000	1.118
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.10.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.gnome.org/projects/rhythmbox/
@@ -51,6 +51,8 @@
 Patch4: rhythmbox-0.10.1-podcasts.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=291571
 Patch5: rb-disable-local-uri-escaping-5.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=357951
+Patch6: rhythmbox-0.10.1-fix-metadata-trailing-space.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -70,6 +72,7 @@
 %patch3 -p0 -b .dont-resize-stores
 %patch4 -p1 -b .ipod-podcasts
 %patch5 -p0 -b .uri-escaping
+%patch6 -p2 -b .trailing-space
 
 %build
 
@@ -158,6 +161,10 @@
 %{_libexecdir}/rhythmbox-metadata
 
 %changelog
+* Tue Oct 30 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-5.fc7
+- Add patch to fix problems with metadata loss when it has a space at the
+  end of it (#357951)
+
 * Mon Oct 29 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-4.fc7
 - Update fix related to file URIs escaping (#291571)