- merged from HEAD

Changed files:
    gnome-terminal-TERM.patch -> 1.5.8.1
    gnome-terminal-desktop.patch -> 1.2.4.1
    gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch -> 1.1.6.1
    gnome-terminal.spec -> 1.72.4.1

diff --git a/gnome-terminal-TERM.patch b/gnome-terminal-TERM.patch
index 1c5cbdc843343ff89fd77ca2d04c66923e81ba4b..9f3dd6bccd1f7ff35e90c5460fd0257bba2840b3 100644 (file)
--- a/gnome-terminal-TERM.patch
+++ b/gnome-terminal-TERM.patch
@@ -1,11 +1,12 @@
---- gnome-terminal-1.9.7/src/terminal-screen.c.wiget   Wed Jun  5 04:57:01 2002
-+++ gnome-terminal-1.9.7/src/terminal-screen.c Wed Jun  5 04:57:14 2002
-@@ -885,7 +885,7 @@
- 
+diff -aurN gnome-terminal-2.13.90.orig/src/terminal-screen.c gnome-terminal-2.13.90/src/terminal-screen.c
+--- gnome-terminal-2.13.90.orig/src/terminal-screen.c  2006-01-30 05:19:50.000000000 +0100
++++ gnome-terminal-2.13.90/src/terminal-screen.c       2006-01-30 23:25:26.100754000 +0100
+@@ -1111,7 +1111,7 @@
    retval[i] = g_strdup ("COLORTERM="EXECUTABLE_NAME);
    ++i;
+ 
 -  retval[i] = g_strdup ("TERM=xterm"); /* FIXME configurable later? */
 +  retval[i] = g_strdup ("TERM=gnome"); /* FIXME configurable later? */
    ++i;
+ 
    retval[i] = g_strdup_printf ("WINDOWID=%ld",
-                                GDK_WINDOW_XWINDOW (term->window));

diff --git a/gnome-terminal-desktop.patch b/gnome-terminal-desktop.patch
index 3e1ed0a0bbb12e3d300e25e603e9f927594b55f6..54e9e5746a85befa3ece81dc5430eae8c95a6905 100644 (file)
--- a/gnome-terminal-desktop.patch
+++ b/gnome-terminal-desktop.patch
@@ -1,10 +1,10 @@
-diff -ur gnome-terminal-2.6.1.orig/gnome-terminal.desktop.in.in gnome-terminal-2.6.1/gnome-terminal.desktop.in.in
---- gnome-terminal-2.6.1.orig/gnome-terminal.desktop.in.in     2004-04-18 07:31:19.000000000 +0200
-+++ gnome-terminal-2.6.1/gnome-terminal.desktop.in.in  2004-08-24 01:20:13.240149960 +0200
-@@ -10,5 +10,5 @@
+diff -aurN gnome-terminal-2.13.90.orig/gnome-terminal.desktop.in.in gnome-terminal-2.13.90/gnome-terminal.desktop.in.in
+--- gnome-terminal-2.13.90.orig/gnome-terminal.desktop.in.in   2006-01-30 05:19:36.000000000 +0100
++++ gnome-terminal-2.13.90/gnome-terminal.desktop.in.in        2006-01-30 23:28:18.360754000 +0100
+@@ -11,5 +11,5 @@
  X-GNOME-Bugzilla-Product=gnome-terminal
  X-GNOME-Bugzilla-Component=general
  X-GNOME-Bugzilla-Version=@VERSION@
--Categories=GNOME;Application;System;Utility;TerminalEmulator;
+-Categories=GNOME;GTK;Application;Utility;TerminalEmulator;
 +Categories=GTK;GNOME;Utility;TerminalEmulator;
  StartupNotify=true

diff --git a/gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch b/gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch
index 75d13945c64e40e0d65ef750716d192623aad6f5..dad33867f811e98e52700a0a63eacc1a1b24a4a0 100644 (file)
--- a/gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch
+++ b/gnome-terminal-disable-prev_next-tab-sensitivity-changes.patch
@@ -1,24 +1,25 @@
---- gnome-terminal-2.6.1/src/terminal-window.c~        2004-05-07 14:31:44.364178354 +0200
-+++ gnome-terminal-2.6.1/src/terminal-window.c 2004-05-07 14:32:03.449429701 +0200
-@@ -1283,8 +1283,8 @@
-   notebook = window->priv->notebook;
+diff -aurN gnome-terminal-2.13.90.orig/src/terminal-window.c gnome-terminal-2.13.90/src/terminal-window.c
+--- gnome-terminal-2.13.90.orig/src/terminal-window.c  2006-01-12 15:06:03.000000000 +0100
++++ gnome-terminal-2.13.90/src/terminal-window.c       2006-01-30 23:34:19.630754000 +0100
+@@ -1361,8 +1361,8 @@
+   num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook));
    page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
    
 -  gtk_widget_set_sensitive (window->priv->previous_tab_menuitem,
 -                            page_num > 0);
-+  //gtk_widget_set_sensitive (window->priv->previous_tab_menuitem,
-+  //                          page_num > 0);
++  /*gtk_widget_set_sensitive (window->priv->previous_tab_menuitem,
++                            page_num > 0);*/
  
+   on_last_page = (page_num >= num_pages - 1);
+ 
+@@ -1384,8 +1384,8 @@
+       gtk_widget_set_sensitive (window->priv->move_right_tab_menuitem, TRUE);
+     }
  
-   /* FIXME
-@@ -1299,8 +1299,8 @@
-   else
-     gtk_widget_set_sensitive (window->priv->close_tab_menuitem, TRUE);
-   
 -  gtk_widget_set_sensitive (window->priv->next_tab_menuitem,
 -                            !on_last_page);
-+  //gtk_widget_set_sensitive (window->priv->next_tab_menuitem,
-+  //                          !on_last_page);
++  /*gtk_widget_set_sensitive (window->priv->next_tab_menuitem,
++                            !on_last_page);*/
  }
  
  static void

diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 0edb405b4f499255693cb2590e82eb51eee95ff1..bfd4ab0daedd04b13a7429f390f7b1212caceb83 100644 (file)
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -3,16 +3,19 @@
 # passing the keypress to the application running in the terminal). Ditto 
 # for the last tab. This is kinda annoying.
 %bcond_with    disable_prev_next_tab_sensitivity_changes
+# This is specific to PLD and causes an "unknown term type" on most other
+# hosts I have to work on (the rest of the world uses xterm for g-t)
+%bcond_with    term_voodoo
 #
 Summary:       GNOME Terminal
 Summary(pl):   Terminal dla GNOME
 Name:          gnome-terminal
-Version:       2.12.0
+Version:       2.14.1
 Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 483c9397dd165845e2528a80e3df6dfc
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 7abe60db5359c88392d2b4f0d5587ef5
 Patch0:                %{name}-TERM.patch
 Patch1:                %{name}-disable-prev_next-tab-sensitivity-changes.patch
 Patch2:                %{name}-desktop.patch
@@ -48,13 +51,16 @@ To jest terminal, na razie ca
 
 %prep
 %setup -q
+%if %{with term_voodoo}
 %patch0 -p1
+%endif
 %if %{with disable_prev_next_tab_sensitivity_changes}
 %patch1 -p1
 %endif
 %patch2 -p1
 
 %build
+%{__intltoolize}
 %{__gnome_doc_common}
 %{__libtoolize}
 %{__aclocal}
@@ -91,11 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog NEWS TODO AUTHORS
+%doc AUTHORS ChangeLog NEWS README
 %doc %{_omf_dest_dir}/%{name}
 %attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
-%{_datadir}/%{name}
 %{_libdir}/bonobo/servers/*
+%{_datadir}/%{name}
 %{_desktopdir}/*
 %{_pixmapsdir}/*
+%{_sysconfdir}/gconf/schemas/gnome-terminal.schemas