--- a/ChangeLog	Wed Oct 31 11:55:07 2007 +0000
+++ b/ChangeLog	Wed Oct 31 13:50:27 2007 +0000
@@ -1,3 +1,10 @@
+2007-10-31  Damien Carbery <[email protected]>
+
+	* base-specs/totem.spec: Add patch 07-tick to change TICK to TTICK
+	  because TICK is already defined on Solaris and breaks totem. Fixed
+	  bugzilla ??????.
+	* patches/totem-07-tick.diff: Added to fix ??????.
+
 2007-10-31  Damien Carbery <[email protected]>
 
 	* SUNWgnome-remote-desktop.spec: Remove %{_datadir}/icons from %files

--- a/base-specs/evolution.spec	Wed Oct 31 11:55:07 2007 +0000
+++ b/base-specs/evolution.spec	Wed Oct 31 13:50:27 2007 +0000
@@ -37,7 +37,7 @@
 Patch6:       evolution-06-perl-path.diff
 # date:2007-06-26 bugzilla:237830 owner:jedy type:bug
 Patch7:       evolution-07-lost-tab.diff
-# date:2007-10-31 bugzilla:?????? owner:dcarbery type:bug
+# date:2007-10-31 bugzilla:492058 owner:dcarbery type:bug
 Patch8:       evolution-08-unions.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -122,6 +122,7 @@
 cp addressbook/tools/csv2vcard addressbook/tools/csv2vcard.in
 
 %patch7 -p1
+%patch8 -p1
 
 %build
 

--- a/base-specs/totem.spec	Wed Oct 31 11:55:07 2007 +0000
+++ b/base-specs/totem.spec	Wed Oct 31 13:50:27 2007 +0000
@@ -26,10 +26,12 @@
 Patch3:       totem-03-novisual.diff
 #owner:jerrytan date:2007-06-20 type:branding
 Patch4:	      totem-04-browserplugin.diff
-#owner:dcarbery date:2007-10-31 type:bug bugzilla:??????
+#owner:dcarbery date:2007-10-31 type:bug bugzilla:492068
 Patch5:       totem-05-shell-change.diff
-#owner:dcarbery date:2007-10-31 type:bug bugzilla:??????
+#owner:dcarbery date:2007-10-31 type:bug bugzilla:492074
 Patch6:       totem-06-asprintf.diff
+#owner:dcarbery date:2007-10-31 type:bug bugzilla:49????
+Patch7:       totem-07-tick.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -66,6 +68,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %ifos linux
@@ -149,6 +152,8 @@
 
 %changelog
 * Wed Oct 31 2007 - [email protected]
+- Add patch 07-tick to change TICK to TTICK to fix bugzilla ??????.
+* Wed Oct 31 2007 - [email protected]
 - Add patches 05-shell-change and 06-asprintf.
 * Tue Oct 30 2007 - [email protected]
 - Bump to 2.20.0.

--- a/patches/totem-05-shell-change.diff	Wed Oct 31 11:55:07 2007 +0000
+++ b/patches/totem-05-shell-change.diff	Wed Oct 31 13:50:27 2007 +0000
@@ -1,8 +1,11 @@
 --- totem-2.21.0/data/mime-type-include.sh.orig	2007-10-31 08:18:45.400841275 +0000
 +++ totem-2.21.0/data/mime-type-include.sh	2007-10-31 08:16:58.461126162 +0000
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/ksh
+@@ -6,7 +6,7 @@
+ 	echo "\"$i\","
+ }
  
- . `dirname $0`/mime-functions.sh
+-if [ x"$1" == "x--nautilus" ] ; then
++if [ x"$1" = "x--nautilus" ] ; then
+ 	get_audio_mimetypes $2;
  
+ 	echo "/* generated with mime-types-include.sh in the totem module, don't edit or "

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/totem-07-tick.diff	Wed Oct 31 13:50:27 2007 +0000
@@ -0,0 +1,29 @@
+--- totem-2.21.0/browser-plugin/totem-plugin-viewer.c.orig	2007-10-31 08:55:49.681787049 +0000
++++ totem-2.21.0/browser-plugin/totem-plugin-viewer.c	2007-10-31 13:33:48.599289474 +0000
+@@ -188,7 +188,7 @@
+ 	BUTTON_PRESS,
+ 	START_STREAM,
+ 	STOP_STREAM,
+-	TICK,
++	TTICK,
+ 	LAST_SIGNAL
+ };
+ 
+@@ -249,7 +249,7 @@
+ 				g_cclosure_marshal_VOID__VOID,
+ 				G_TYPE_NONE,
+ 				0, NULL);
+-	signals[TICK] =
++	signals[TTICK] =
+ 		g_signal_newv ("tick",
+ 				G_TYPE_FROM_CLASS (object_class),
+ 				G_SIGNAL_RUN_LAST,
+@@ -1596,7 +1596,7 @@
+ 			 current_time, stream_length);
+ 	}
+ 
+-	g_signal_emit (emb, signals[TICK], 0,
++	g_signal_emit (emb, signals[TTICK], 0,
+ 		       (guint32) current_time, (guint32) stream_length, totem_states[emb->state]);
+ }
+