--- a/ChangeLog	Wed Jun 16 15:08:19 2010 +0000
+++ b/ChangeLog	Thu Jun 17 05:24:14 2010 +0000
@@ -1,3 +1,14 @@
+2010-06-17  Brian Lu  <set EMAIL_ADDRESS environment variable>
+
+	* base-specs/ekiga.spec:
+	* patches/ekiga-05-empty-welcome-page.diff:
+	  Fix bug d.o.o 8416
+
+	* base-specs/gtksourceview.spec:
+	* patches/gtksourceview-01-fixxref.diff:
+	* specs/SUNWgnome-gtksourceview.spec:
+	  Remove gtksourceview 1.0
+
 2010-06-16 Arvind Umrao  <[email protected]>
 
         * xscreensaver-13-trusted.diff: Updated

--- a/base-specs/ekiga.spec	Wed Jun 16 15:08:19 2010 +0000
+++ b/base-specs/ekiga.spec	Thu Jun 17 05:24:14 2010 +0000
@@ -32,8 +32,10 @@
 
 # owner:elaine date:2009-07-13 type:branding
 # Once Boost integrateed please remove this patch
-patch3:         ekiga-03-boost-header.diff
+Patch3:         ekiga-03-boost-header.diff
 
+# owner:hawklu date:2010-06-17 type bug d.o.o:8416
+Patch4:        ekiga-05-empty-welcome-page.diff
 
 URL:		http://www.ekiga.org
 BuildRoot:	%{_tmppath}/%{name}-root
@@ -102,6 +104,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %ifos linux
@@ -173,6 +176,8 @@
 
 
 %changelog
+* Thu Jun 17 2010 - [email protected]
+- Fix d.o.o 8416
 * Fri Jun 04 2010 - [email protected]
 - Bump to 3.2.7
 * Tue May 25 2010 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ekiga-05-empty-welcome-page.diff	Thu Jun 17 05:24:14 2010 +0000
@@ -0,0 +1,35 @@
+From d11ec091a9eaa2a96b277af0e18677df5b544589 Mon Sep 17 00:00:00 2001
+From: Brian Lu <[email protected]>
+Date: Sun, 13 Jun 2010 11:57:58 +0800
+Subject: [PATCH] Fix the bug bgo#621419
+
+---
+ src/gui/assistant.cpp |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
+index ab187d4..600483a 100644
+--- a/src/gui/assistant.cpp
++++ b/src/gui/assistant.cpp
+@@ -1562,8 +1562,8 @@ ekiga_assistant_cancel (GtkAssistant *gtkassistant)
+ 
+   main_window = GnomeMeeting::Process ()->GetMainWindow ();
+ 
+-  gtk_widget_hide (GTK_WIDGET (gtkassistant));
+   gtk_assistant_set_current_page (gtkassistant, 0);
++  gtk_widget_hide (GTK_WIDGET (gtkassistant));
+   gtk_widget_show (main_window);
+ }
+ 
+@@ -1619,8 +1619,6 @@ ekiga_assistant_new (Ekiga::ServiceCore *core)
+   assistant->priv->core = core;
+ 
+   /* FIXME: move this into the caller */
+-  g_signal_connect (assistant, "cancel",
+-                    G_CALLBACK (gtk_widget_hide), NULL);
+   g_signal_connect (assistant, "key-press-event",
+                     G_CALLBACK (ekiga_assistant_key_press_cb), NULL);
+ 
+-- 
+1.5.6.5
+

--- a/patches/gtksourceview-01-fixxref.diff	Wed Jun 16 15:08:19 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -ruN gtksourceview-1.8.5.orig/docs/reference/Makefile.am gtksourceview-1.8.5/docs/reference/Makefile.am
---- gtksourceview-1.8.5.orig/docs/reference/Makefile.am	2010-01-05 00:46:36.844942555 +0000
-+++ gtksourceview-1.8.5/docs/reference/Makefile.am	2010-01-05 00:47:09.165661071 +0000
-@@ -44,7 +44,7 @@
- content_files =	version.xml
- 
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS=
-+FIXXREF_OPTIONS=--module=$(DOC_MODULE)
- 
- # include common portion ...
- include $(top_srcdir)/gtk-doc.make

--- a/specs/SUNWgnome-gtksourceview.spec	Wed Jun 16 15:08:19 2010 +0000
+++ b/specs/SUNWgnome-gtksourceview.spec	Thu Jun 17 05:24:14 2010 +0000
@@ -10,7 +10,6 @@
 %define owner hawklu
 #
 %include Solaris.inc
-%use gtksourceview = gtksourceview.spec
 %use gsv2 = gtksourceview2.spec
 
 Name:                    SUNWgnome-gtksourceview
@@ -48,18 +47,15 @@
 %prep
 rm -rf %name-%version
 mkdir %name-%version
-%gtksourceview.prep -d %name-%version
 %gsv2.prep -d %name-%version
 cd %{_builddir}/%name-%version
 gzcat %SOURCE0 | tar xf -
 
 %build
-%gtksourceview.build -d %name-%version
 %gsv2.build -d %name-%version
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%gtksourceview.install -d %name-%version
 %gsv2.install -d %name-%version
 
 rm -rf $RPM_BUILD_ROOT%{_mandir}
@@ -84,7 +80,6 @@
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*.so*
 %dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/gtksourceview-1.0
 %{_datadir}/gtksourceview-2.0
 
 %files devel
@@ -107,6 +102,8 @@
 %endif
 
 %changelog
+* Thu Jun 17 2010 - [email protected]
+- Since drivel is bummped to 3.0.1, remove gtksourceview 1.x
 * Mon Mar 23 2009 - [email protected]
 - Since /usr/share/gtksourceview-2.0/language-specs/convert.py
   (SUNWgnome-gtksourceview) requires /usr/bin/i86/isapython2.4 which is