--- a/ChangeLog	Tue Dec 18 12:29:49 2007 +0000
+++ b/ChangeLog	Tue Dec 18 12:53:27 2007 +0000
@@ -1,3 +1,10 @@
+2007-12-18  Damien Carbery <[email protected]>
+
+	* base-specs/gnome-terminal.spec: Remove upstream patch 01-encodings.
+	  Rename remainder.
+	* patches/gnome-terminal-01-encodings.diff: Removed, upstream.
+	* patches/gnome-terminal-01-menu-entry.diff: Renamed from 02.
+
 2007-12-18  Damien Carbery <[email protected]>
 
 	* base-specs/gnome-terminal.spec, base-specs/gucharmap.spec,

--- a/base-specs/gnome-terminal.spec	Tue Dec 18 12:29:49 2007 +0000
+++ b/base-specs/gnome-terminal.spec	Tue Dec 18 12:53:27 2007 +0000
@@ -18,10 +18,8 @@
 Summary:      GNOME Terminal
 Source:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.21/%{name}-%{version}.tar.bz2
 Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
-#owner:yippi date:2005-08-11 type:bug bugster:5043182 bugzilla:144000
-Patch1:       gnome-terminal-01-encodings.diff
 #owner:yippi date:2006-05-04 type:branding
-Patch2:       gnome-terminal-02-menu-entry.diff
+Patch1:       gnome-terminal-01-menu-entry.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -54,7 +52,6 @@
 cd po-sun; make; cd ..
 %endif
 %patch1 -p1
-%patch2 -p1
 
 # dos2unix to fix 400207.
 dos2unix -ascii po/be.po po/be.po
@@ -121,7 +118,7 @@
 
 %changelog
 * Tue Dec 18 2007 - [email protected]
-- Bump to 2.21.4.
+- Bump to 2.21.4. Remove upstream patch 01-encodings. Rename remainder.
 * Wed Dec 05 2007 - [email protected]
 - Bump to 2.21.3.  Remove patch gnome-terminal-03-fix-focus.diff and
   gnome-terminal-04-window-resizing.diff.  I verified that the bugster bugs

--- a/patches/gnome-terminal-01-encodings.diff	Tue Dec 18 12:29:49 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
---- gnome-terminal-2.21.3/src/encoding.c-orig	2007-12-05 16:45:08.975130000 -0600
-+++ gnome-terminal-2.21.3/src/encoding.c	2007-12-05 16:49:03.347806000 -0600
-@@ -137,9 +137,19 @@ static TerminalEncoding encodings[] = {
-     "IBM864", N_("Arabic") },
- 
-   { TERMINAL_ENCODING_ISO_2022_JP, FALSE,
--    "ISO2022JP", N_("Japanese") },
-+#ifdef __sun
-+    "ISO-2022-JP",
-+#else
-+    "ISO2022JP",
-+#endif
-+    N_("Japanese") },
-   { TERMINAL_ENCODING_ISO_2022_KR, FALSE,
--    "ISO2022KR", N_("Korean") },
-+#ifdef __sun
-+    "ISO-2022-KR",
-+#else
-+    "ISO2022KR",
-+#endif
-+    N_("Korean") },
-   { TERMINAL_ENCODING_ISO_IR_111, FALSE,
-     "ISO-IR-111", N_("Cyrillic") },
-   { TERMINAL_ENCODING_JOHAB, FALSE,
-@@ -181,7 +191,12 @@ static TerminalEncoding encodings[] = {
-     "MAC_UKRAINIAN", N_("Cyrillic/Ukrainian") },
-   
-   { TERMINAL_ENCODING_SHIFT_JIS, FALSE,
--    "SHIFT-JIS", N_("Japanese") },
-+#ifdef __sun
-+    "SHIFT_JIS",
-+#else
-+    "SHIFT-JIS",
-+#endif
-+    N_("Japanese") },
-   { TERMINAL_ENCODING_TCVN, FALSE,
-     "TCVN", N_("Vietnamese") },
-   { TERMINAL_ENCODING_TIS_620, FALSE,
-@@ -937,7 +952,7 @@ terminal_encoding_init (GConfClient *con
-        * which the underlying GIConv implementation can't support.
-        */
-       converted = g_convert (ascii_sample, sizeof (ascii_sample) - 1,
--		             encodings[i].charset, encodings[i].charset,
-+		             encodings[i].charset, encodings[TERMINAL_ENCODING_CURRENT_LOCALE].charset,
- 			     &bytes_read, &bytes_written, NULL);
-       
-       /* The encoding is only valid if ASCII passes through cleanly. */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-terminal-01-menu-entry.diff	Tue Dec 18 12:53:27 2007 +0000
@@ -0,0 +1,20 @@
+diff -urN gnome-terminal-2.18.0/gnome-terminal.desktop.in.in gnome-terminal-2.18.0-hacked/gnome-terminal.desktop.in.in
+--- gnome-terminal-2.18.0/gnome-terminal.desktop.in.in	2006-01-30 17:01:37.000000000 +1300
++++ gnome-terminal-2.18.0-hacked/gnome-terminal.desktop.in.in	2006-06-02 14:13:32.394446000 +1200
+@@ -1,7 +1,8 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+ _Name=Terminal
+-_Comment=Use the command line
++# SUN_BRANDING
++_Comment=Run a command line shell
+ TryExec=gnome-terminal
+ Exec=gnome-terminal
+ Icon=gnome-terminal.png
+@@ -12,5 +12,5 @@
+ X-GNOME-Bugzilla-Product=gnome-terminal
+ X-GNOME-Bugzilla-Component=general
+ X-GNOME-Bugzilla-Version=@VERSION@
+-Categories=GNOME;GTK;Utility;TerminalEmulator;
++Categories=GNOME;GTK;Application;System;TerminalEmulator;
+ StartupNotify=true

--- a/patches/gnome-terminal-02-menu-entry.diff	Tue Dec 18 12:29:49 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-diff -urN gnome-terminal-2.18.0/gnome-terminal.desktop.in.in gnome-terminal-2.18.0-hacked/gnome-terminal.desktop.in.in
---- gnome-terminal-2.18.0/gnome-terminal.desktop.in.in	2006-01-30 17:01:37.000000000 +1300
-+++ gnome-terminal-2.18.0-hacked/gnome-terminal.desktop.in.in	2006-06-02 14:13:32.394446000 +1200
-@@ -1,7 +1,8 @@
- [Desktop Entry]
- Encoding=UTF-8
- _Name=Terminal
--_Comment=Use the command line
-+# SUN_BRANDING
-+_Comment=Run a command line shell
- TryExec=gnome-terminal
- Exec=gnome-terminal
- Icon=gnome-terminal.png
-@@ -12,5 +12,5 @@
- X-GNOME-Bugzilla-Product=gnome-terminal
- X-GNOME-Bugzilla-Component=general
- X-GNOME-Bugzilla-Version=@VERSION@
--Categories=GNOME;GTK;Utility;TerminalEmulator;
-+Categories=GNOME;GTK;Application;System;TerminalEmulator;
- StartupNotify=true