From 41c74d9e7f6e7394a5a2159a87aabc5792ccb4548f1e0553d2f51a9d1cd1d324 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 5 May 2008 23:23:13 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gnome-terminal?expand=0&rev=17

---
 gnome-terminal-force-terminal-draw.patch | 29 ------------------------
 gnome-terminal-uninited-vars.patch       | 11 ---------
 gnome-terminal.changes                   |  8 +++++++
 gnome-terminal.spec                      | 15 ++++++------
 4 files changed, 15 insertions(+), 48 deletions(-)
 delete mode 100644 gnome-terminal-force-terminal-draw.patch
 delete mode 100644 gnome-terminal-uninited-vars.patch

diff --git a/gnome-terminal-force-terminal-draw.patch b/gnome-terminal-force-terminal-draw.patch
deleted file mode 100644
index 1497558..0000000
--- a/gnome-terminal-force-terminal-draw.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gnome-terminal-2.15.4/src/terminal-window.c
-+++ gnome-terminal-2.15.4/src/terminal-window.c
-@@ -1428,6 +1428,14 @@
-   update_copy_sensitivity (window);
- }
- 
-+static gboolean
-+force_terminal_redraw_callback (gpointer user_data)
-+{
-+  gtk_widget_queue_draw (GTK_WIDGET (user_data));
-+  g_object_unref (user_data);
-+  return FALSE;
-+}
-+
- void
- terminal_window_add_screen (TerminalWindow *window,
-                             TerminalScreen *screen)
-@@ -1821,6 +1829,11 @@
-   /* Make the first-added screen the active one */
-   if (window->priv->active_term == NULL)
-     terminal_window_set_active (window, screen);
-+
-+  /* We have to force a redraw in an idle, since sometimes new terminals
-+     in new tabs don't seem to get their initial expose events. */
-+  g_object_ref (term);
-+  g_idle_add (force_terminal_redraw_callback, term);
- }
- 
- static void
diff --git a/gnome-terminal-uninited-vars.patch b/gnome-terminal-uninited-vars.patch
deleted file mode 100644
index ed4a240..0000000
--- a/gnome-terminal-uninited-vars.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/simple-x-font-selector.c
-+++ src/simple-x-font-selector.c
-@@ -1170,6 +1170,8 @@
-   /* Add another entry to the table for this new font family */
-   temp_info.family = family_exists ? family : g_strdup(family);
-   temp_info.foundry = foundry;
-+  temp_info.style_index = 0;
-+  temp_info.nstyles = 0;
-   temp_fontname = g_slist_prepend (NULL, fontname);
-   
-   (*ntable)++;
diff --git a/gnome-terminal.changes b/gnome-terminal.changes
index 9f1c5ad..8bd58d4 100644
--- a/gnome-terminal.changes
+++ b/gnome-terminal.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon May  5 10:54:32 CEST 2008 - jpr@suse.de
+
+- Remove gnome-terminal-force-terminal-draw.patch, it was fixed 
+  in a different way upstream, see bgo #338913
+- Remove gnome-terminal-uninited-vars.patch, the simple font 
+  selector it applied against was removed
+
 -------------------------------------------------------------------
 Fri Apr 11 17:21:48 CEST 2008 - maw@suse.de
 
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 61d3cf5..edc8944 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -17,17 +17,13 @@ License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/X11/Terminals
 Obsoletes:      gnome-core
 Version:        2.22.1
-Release:        1
+Release:        11
 Summary:        The GNOME 2.x Desktop Terminal
 Source:         %{name}-%{version}.tar.bz2
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         filesystem gconf2
-# PATCH-NEEDS-REBASE gnome-terminal-force-terminal-draw.patch
-Patch2:         gnome-terminal-force-terminal-draw.patch
 Patch4:         gnome-terminal-desktop.patch
-# PATCH-NEEDS-REBASE gnome-terminal-uninited-vars.patch
-Patch5:         %{name}-uninited-vars.patch
 Patch6:         gnome-terminal-2.18.1-correct-help-uri.patch
 Requires:       %{name}-lang = %{version}
 %gconf_schemas_prereq
@@ -41,9 +37,7 @@ handy for quick tasks on the command line.
 %lang_package
 %prep
 %setup -q
-#%patch2 -p1
 %patch4 -p1
-#%patch5
 %patch6 -p1
 
 %build
@@ -55,7 +49,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure\
 	--disable-schemas-install\
 	--disable-scrollkeeper
-make %{?jobs:-j%jobs}
+%__make %{?jobs:-j%jobs}
 
 %install
 %makeinstall
@@ -90,6 +84,11 @@ rm -rf $RPM_BUILD_ROOT
 %files lang -f %{name}.lang
 
 %changelog
+* Mon May 05 2008 jpr@suse.de
+- Remove gnome-terminal-force-terminal-draw.patch, it was fixed
+  in a different way upstream, see bgo #338913
+- Remove gnome-terminal-uninited-vars.patch, the simple font
+  selector it applied against was removed
 * Fri Apr 11 2008 maw@suse.de
 - Update to version 2.22.1:
   + Bugs fixed: bgo#521193 and bgo#521417.