--- a/ChangeLog	Sun Jun 17 21:57:42 2007 +0000
+++ b/ChangeLog	Sun Jun 17 22:04:14 2007 +0000
@@ -2,6 +2,12 @@
 
 	==== Vermillion build 68 ====
 
+2007-06-17  Damien Carbery <[email protected]>
+
+	* base-specs/gedit.spec: Remove patch 01-no-zh_TW-help as the bug,
+	  #397299, has been resolved.
+	* patches/gedit-01-no-zh_TW-help.diff: Removed, upstream.
+
 2007-06-15  Damien Carbery <[email protected]>
 
 	* base-specs/rhythmbox.spec: Add --disable-daap configure option. It

--- a/base-specs/gedit.spec	Sun Jun 17 21:57:42 2007 +0000
+++ b/base-specs/gedit.spec	Sun Jun 17 22:04:14 2007 +0000
@@ -18,10 +18,8 @@
 Summary:	Text Editor for GNOME
 Source:		http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.18/%{name}-%{version}.tar.bz2
 Source1:	%{name}-po-sun-%{po_sun_version}.tar.bz2
-# date:2006-03-14 owner:dcarbery type:bug bugzilla:397299
-Patch1:         gedit-01-no-zh_TW-help.diff
 # date:2006-06-06 owner:gman type:branding
-Patch2:         gedit-02-menu-entry.diff
+Patch1:         gedit-01-menu-entry.diff
 URL:            http://www.gnome.org
 URL:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -71,7 +69,6 @@
 cd po-sun; make; cd ..
 %endif
 %patch1 -p1
-%patch2 -p1
 
 %build
 %ifos linux
@@ -147,6 +144,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Jun 17 2007 - [email protected]
+- Remove patch 01-no-zh_TW-help as the bug, #397299, has been resolved.
+
 * Thu Apr 12 2007 - [email protected]
 - Bump to 2.18.1.
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gedit-01-menu-entry.diff	Sun Jun 17 22:04:14 2007 +0000
@@ -0,0 +1,13 @@
+diff -urN gedit-2.14.2/data/gedit.desktop.in.in gedit-2.14.2-hacked/data/gedit.desktop.in.in
+--- gedit-2.14.2/data/gedit.desktop.in.in	2006-01-22 07:03:52.000000000 +1300
++++ gedit-2.14.2-hacked/data/gedit.desktop.in.in	2006-06-02 12:04:50.327494000 +1200
+@@ -1,7 +1,8 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ _Name=Text Editor
+-_Comment=Edit text files
++# SUN_BRANDING
++_Comment=Edit text or source files, with syntax highlighting
+ Exec=gedit %U
+ Terminal=false
+ Type=Application

--- a/patches/gedit-01-no-zh_TW-help.diff	Sun Jun 17 21:57:42 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gedit-2.18.1/help/Makefile.am.orig	2006-03-14 18:15:05.124306000 +0000
-+++ gedit-2.18.1/help/Makefile.am	2006-03-14 18:15:16.466729000 +0000
-@@ -12,7 +12,7 @@
- 	figures/gedit_recent_files_menu_icon.png	\
- 	figures/gedit_window.png	
- 
--DOC_LINGUAS = bg de es fr it ja ru sv uk zh_CN zh_HK zh_TW
-+DOC_LINGUAS = bg de es fr it ja ru sv uk zh_CN zh_HK
- 
- # These languages aren't yet converted to gnome-doc-utils
- SUBDIRS = eu ko ro

--- a/patches/gedit-02-menu-entry.diff	Sun Jun 17 21:57:42 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff -urN gedit-2.14.2/data/gedit.desktop.in.in gedit-2.14.2-hacked/data/gedit.desktop.in.in
---- gedit-2.14.2/data/gedit.desktop.in.in	2006-01-22 07:03:52.000000000 +1300
-+++ gedit-2.14.2-hacked/data/gedit.desktop.in.in	2006-06-02 12:04:50.327494000 +1200
-@@ -1,7 +1,8 @@
- [Desktop Entry]
- Encoding=UTF-8
- _Name=Text Editor
--_Comment=Edit text files
-+# SUN_BRANDING
-+_Comment=Edit text or source files, with syntax highlighting
- Exec=gedit %U
- Terminal=false
- Type=Application