--- a/ChangeLog	Thu Feb 05 21:33:38 2009 +0000
+++ b/ChangeLog	Thu Feb 05 22:23:23 2009 +0000
@@ -1,3 +1,10 @@
+2009-02-05  Christian Kelly  <[email protected]>
+
+	* patches/totem-06-function.diff: Remove.
+	* patches/totem-01-remove-unsupported-format.diff: Rework.
+	* base-specs/totem-pl-parser.spec: Bump to 2.25.90.
+	* base-specs/totem.spec: Bump to 2.25.90.
+
 2009-02-05  Christian Kelly  <[email protected]>
 
 	* SUNWgnome-gvfs: Add lib to %files.

--- a/base-specs/totem-pl-parser.spec	Thu Feb 05 21:33:38 2009 +0000
+++ b/base-specs/totem-pl-parser.spec	Thu Feb 05 22:23:23 2009 +0000
@@ -11,7 +11,7 @@
 Name:         totem-pl-parser
 License:      LGPL v2
 Group:        System/GUI/GNOME
-Version:      2.25.1
+Version:      2.25.90
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -123,6 +123,8 @@
 %{_includedir}/totem/*
 
 %changelog
+* Thu Feb 05 2009 - [email protected]
+- Bump to 2.25.90.
 * Tue Jan 20 2009 - [email protected]
 - Bump to 2.25.1.  Remove upstream patch totem-pl-parser-01-ignore-cdda.diff.
 * Wed Sep 24 2008 - [email protected]

--- a/base-specs/totem.spec	Thu Feb 05 21:33:38 2009 +0000
+++ b/base-specs/totem.spec	Thu Feb 05 22:23:23 2009 +0000
@@ -11,7 +11,7 @@
 Name:         totem
 License:      GPL v2, LGPL v2, BSD
 Group:        System/GUI/GNOME
-Version:      2.25.3
+Version:      2.25.90
 Release:      1
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -68,7 +68,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %ifos linux
@@ -165,6 +164,10 @@
 %{_includedir}/totem/*
 
 %changelog
+* Thu Feb 05 2009 - [email protected]
+- Bump to 2.25.90.
+- Remove patches/totem-06-function.diff.
+- Rework patches/totem-01-remove-unsupported-format.diff.
 * Tue Jan 20 2009 - [email protected]
 - Bump to 2.25.3.  Remove upstream patch totem-05-avoid-plugin-coredump.diff.
   Add patch totem-06-function.diff.

--- a/patches/totem-01-remove-unsupported-format.diff	Thu Feb 05 21:33:38 2009 +0000
+++ b/patches/totem-01-remove-unsupported-format.diff	Thu Feb 05 22:23:23 2009 +0000
@@ -1,18 +1,6 @@
 diff -ruN totem-2.25.2.orig/data/mime-type-list.txt totem-2.25.2/data/mime-type-list.txt
 --- totem-2.25.2.orig/data/mime-type-list.txt	2008-09-01 20:44:34.283787179 +0100
 +++ totem-2.25.2/data/mime-type-list.txt	2008-09-01 20:47:35.482490427 +0100
-@@ -3,11 +3,9 @@ application/ram
- application/sdp
- application/smil
- application/smil+xml
--application/vnd.rn-realmedia
- application/x-extension-m4a
- application/x-extension-mp4
- application/x-flac
--application/x-flash-video
- application/x-matroska
- application/x-netshow-channel
- application/x-ogg
 @@ -16,7 +14,6 @@ application/x-quicktimeplayer
  application/x-shorten
  application/x-smil
@@ -21,27 +9,6 @@
  audio/ac3
  audio/AMR
  audio/AMR-WB
-@@ -27,7 +24,6 @@ audio/mpeg
- audio/mpegurl
- audio/ogg
- audio/prs.sid
--audio/vnd.rn-realaudio
- audio/x-ape
- audio/x-flac
- audio/x-it
-@@ -44,12 +40,8 @@ audio/x-ms-wma
- audio/x-musepack
- audio/x-pn-aiff
- audio/x-pn-au
--audio/x-pn-realaudio
--audio/x-pn-realaudio-plugin
- audio/x-pn-wav
- audio/x-pn-windows-acm
--audio/x-realaudio
--audio/x-real-audio
- audio/x-sbc
- audio/x-scpls
- audio/x-speex
 --- totem-2.24.0-orig/data/handlers.sh	Fri Sep 19 13:43:46 2008
 +++ totem-2.24.0/data/handlers.sh	Wed Oct  8 17:02:54 2008
 @@ -29,7 +29,12 @@
@@ -58,3 +25,26 @@
  	schema;
  
  	KEY="needs_terminal"
+diff -ruN totem-2.25.90.orig/data/mime-type-list.txt totem-2.25.90/data/mime-type-list.txt
+--- totem-2.25.90.orig/data/mime-type-list.txt	2009-02-05 21:55:25.443775979 +0000
++++ totem-2.25.90/data/mime-type-list.txt	2009-02-05 21:57:55.961954328 +0000
+@@ -4,11 +4,9 @@
+ application/smil
+ application/smil+xml
+ application/vnd.ms-wpl
+-application/vnd.rn-realmedia
+ application/x-extension-m4a
+ application/x-extension-mp4
+ application/x-flac
+-application/x-flash-video
+ application/x-matroska
+ application/x-netshow-channel
+ application/x-ogg
+@@ -27,7 +25,6 @@
+ audio/mpegurl
+ audio/ogg
+ audio/prs.sid
+-audio/vnd.rn-realaudio
+ audio/x-ape
+ audio/x-flac
+ audio/x-gsm

--- a/patches/totem-06-function.diff	Thu Feb 05 21:33:38 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- totem-2.25.3/src/eggfileformatchooser.c-orig	2009-01-22 23:15:37.886115000 -0600
-+++ totem-2.25.3/src/eggfileformatchooser.c	2009-01-22 23:16:08.141216000 -0600
-@@ -621,7 +621,7 @@ egg_file_format_chooser_append_extension
- 
-   if (0 == format)
-     {
--      g_warning ("%s: No file format selected. Cannot append extension.", __FUNCTION__);
-+      g_warning ("%s: No file format selected. Cannot append extension.", G_STRFUNC);
-       return NULL;
-     }
- 
-@@ -648,7 +648,7 @@ egg_file_format_chooser_append_extension
-   if (NULL == extensions)
-     {
-       g_warning ("%s: File format %d doesn't provide file extensions. "
--                 "Cannot append extension.", __FUNCTION__, format);
-+                 "Cannot append extension.", G_STRFUNC, format);
-       return NULL;
-     }
-