fix bug 6772165 gnome-2-24
authorjerrytan
Mon, 01 Dec 2008 02:12:39 +0000
branchgnome-2-24
changeset 14047 efcfacdd5b6e
parent 14046 44fc01f7ecaf
child 14048 7f042549d242
fix bug 6772165
ChangeLog
base-specs/totem-pl-parser.spec
patches/totem-pl-parser-01-ignore-cdda.diff
--- a/ChangeLog	Mon Dec 01 02:00:44 2008 +0000
+++ b/ChangeLog	Mon Dec 01 02:12:39 2008 +0000
@@ -1,3 +1,8 @@
+2008-12-01 Jerry tan <[email protected]>
+        * patches/totem-pl-parser-01-ignore-cdda.diff:
+        * base-specs/totem-pl-parser.spec
+        add patch for fix bug 6772165
+
 2008-12-01  Dave Lin <[email protected]>
 
 	* base-specs/deskbar-applet.spec: Run libtoolize to ensure
--- a/base-specs/totem-pl-parser.spec	Mon Dec 01 02:00:44 2008 +0000
+++ b/base-specs/totem-pl-parser.spec	Mon Dec 01 02:12:39 2008 +0000
@@ -9,7 +9,7 @@
 #
 %include l10n.inc
 Name:         totem-pl-parser
-License:      GPL
+License:      LGPL v2
 Group:        System/GUI/GNOME
 Version:      2.24.1
 Release:      1
@@ -18,6 +18,9 @@
 Summary:      Totem Multimedia Player
 Source:       http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.24/%{name}-%{version}.tar.bz2
 
+#owner:jerrytan date:2008-11-27 type:bug bugzilla:562425 bugster:6772165
+Patch1:       totem-pl-parser-01-ignore-cdda.diff
+
 %if %build_l10n
 Source1:                 l10n-configure.sh
 %endif
@@ -47,6 +50,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %ifos linux
@@ -123,8 +127,6 @@
 %{_includedir}/totem/*
 
 %changelog
-* Mon Nov 03 2008 - [email protected]
-- Bump to 2.24.1.
 * Wed Sep 24 2008 - [email protected]
 - Bump to 2.24.0.
 * Mon Sep 01 2008 - [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/totem-pl-parser-01-ignore-cdda.diff	Mon Dec 01 02:12:39 2008 +0000
@@ -0,0 +1,14 @@
+--- totem-pl-parser-2.24.0/plparse/totem-pl-parser.c.old	2008-11-27 16:34:18.178690000 +0800
++++ totem-pl-parser-2.24.0/plparse/totem-pl-parser.c	2008-11-27 16:35:03.775786000 +0800
+@@ -1415,9 +1415,10 @@
+ 
+ 	if (g_file_has_uri_scheme (file, "mms") != FALSE
+ 			|| g_file_has_uri_scheme (file, "rtsp") != FALSE
++			|| g_file_has_uri_scheme (file, "cdda") != FALSE
+ 			|| g_file_has_uri_scheme (file, "icy") != FALSE
+ 			|| g_file_has_uri_scheme (file, "pnm") != FALSE) {
+-		DEBUG(file, g_print ("URL '%s' is MMS, RTSP, PNM or ICY, not a playlist\n", uri));
++		DEBUG(file, g_print ("URL '%s' is MMS, RTSP,CDDA, PNM or ICY, not a playlist\n", uri));
+ 		return TOTEM_PL_PARSER_RESULT_UNHANDLED;
+ 	}
+