rpms/rhythmbox/F-8 rhythmbox-0.11.0-fix-metadata-trailing-space.patch, NONE, 1.1 rhythmbox.spec, 1.137, 1.138 rhythmbox-0.10.1-fix-metadata-trailing-space.patch, 1.1, NONE

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.11.0-fix-metadata-trailing-space.patch 
Removed Files:
	rhythmbox-0.10.1-fix-metadata-trailing-space.patch 
Log Message:
Update to a patch that should apply cleanly


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

--- NEW FILE rhythmbox-0.11.0-fix-metadata-trailing-space.patch ---
--- trunk/metadata/rb-metadata-gst.c	2007/06/03 01:21:26	5144
+++ trunk/metadata/rb-metadata-gst.c	2007/06/03 02:18:07	5145
@@ -623,7 +623,6 @@
 		 * and then remove leading and trailing whitespace.
 		 */
 		char *str;
-		const char *old_str;
 
 		str = g_value_dup_string (newval);
 
@@ -638,15 +637,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-8/rhythmbox.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- rhythmbox.spec	31 Oct 2007 11:23:15 -0000	1.137
+++ rhythmbox.spec	31 Oct 2007 11:41:29 -0000	1.138
@@ -56,7 +56,7 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=346434
 Patch6: rb-delete-ipod-tracks.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=357951
-Patch7: rhythmbox-0.10.1-fix-metadata-trailing-space.patch
+Patch7: rhythmbox-0.11.0-fix-metadata-trailing-space.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -100,7 +100,7 @@
 pushd plugins/ipod/
 %patch6 -p0 -b .ipod-trash
 popd
-%patch7 -p2 -b .trailing-space
+%patch7 -p1 -b .trailing-space
 
 %build
 


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