--- a/ChangeLog	Fri Apr 13 16:42:19 2012 +0000
+++ b/ChangeLog	Mon Apr 16 12:42:57 2012 +0000
@@ -1,9 +1,16 @@
-2011-04-13  Brian Cameron  <[email protected]>
+2012-04-16  Padraig O'Briain  <[email protected]>
+
+	RTI 361546
+        CR 7035088 gnome-terminal leaks fds
+	* base-specs/gnome-terminal.spec:
+	* patches/gnome-terminal-05-increase-nofds.diff:
+
+2012-04-13  Brian Cameron  <[email protected]>
 
 	* specs/SUNWjson-c.spec: Add "%include desktop-incorporation.inc".
 	  Fixes CR #7149760.  WebRTI #361463.
 
-2011-04-09 Ada Luong <[email protected]>
+2012-04-09 Ada Luong <[email protected]>
 
         ==== S11U1 build 14 ====
 

--- a/base-specs/gnome-terminal.spec	Fri Apr 13 16:42:19 2012 +0000
+++ b/base-specs/gnome-terminal.spec	Mon Apr 16 12:42:57 2012 +0000
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-terminal
 #
-# Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -32,6 +32,8 @@
 #owner:padraig date:2011-05-10 type:branding bugster:7043502
 Patch3:       gnome-terminal-03-fix-doc.diff
 Patch4:       gnome-terminal-04-fix-l10n-doc.diff
+#owner:padraig date:2012-03-30 type:bug bugster:7035088
+Patch5:       gnome-terminal-05-increase-nofds.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -67,6 +69,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # dos2unix to fix 400207.
 dos2unix -ascii po/be.po po/be.po
@@ -136,7 +139,9 @@
 %{_mandir}/man1/*
 
 %changelog
-* Wed May 11 2010 - [email protected]
+* Fri Mar 30 2012 - [email protected]
+* Update number of file descriptors limit to workaround CR 7035088.
+* Wed May 11 2011 - [email protected]
 - Add patch -fix-doc to fix CR 7042502
 * Mon Jun 21 2010 - [email protected]
 - Bump to 2.30.2.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-terminal-05-increase-nofds.diff	Mon Apr 16 12:42:57 2012 +0000
@@ -0,0 +1,35 @@
+--- gnome-terminal-2.30.2/src/terminal.c.orig	2012-03-29 16:11:58.804419794 +0100
++++ gnome-terminal-2.30.2/src/terminal.c	2012-03-30 08:14:52.463772951 +0100
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <sys/resource.h>
+ 
+ #include <glib.h>
+ #include <glib/gstdio.h>
+@@ -255,6 +256,7 @@
+   const char *home_dir;
+   char *working_directory;
+   int ret = EXIT_SUCCESS;
++  struct rlimit rlim;
+ 
+   setlocale (LC_ALL, "");
+ 
+@@ -262,6 +264,16 @@
+   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+   textdomain (GETTEXT_PACKAGE);
+ 
++  if (getrlimit(RLIMIT_NOFILE, &rlim) == 0)
++    {
++      rlim.rlim_cur *= 4;
++      if (rlim.rlim_cur > rlim.rlim_max)
++        {
++          rlim.rlim_cur = rlim.rlim_max;
++        }
++      setrlimit(RLIMIT_NOFILE, &rlim);
++    }
++
+   /* GConf uses ORBit2 which need GThread. See bug #565516 */
+   g_thread_init (NULL);
+