diff --git a/lxterminal-0.1.8-disable-f10.patch b/lxterminal-0.1.8-disable-f10.patch
new file mode 100644
index 0000000..3c99bf9
--- /dev/null
+++ b/lxterminal-0.1.8-disable-f10.patch
@@ -0,0 +1,16 @@
+diff -uNr old-lxterminal-0.1.8//data/lxterminal.conf lxterminal-0.1.8/data/lxterminal.conf
+--- old-lxterminal-0.1.8//data/lxterminal.conf 2010-07-19 19:32:10.000000000 +0200
++++ lxterminal-0.1.8/data/lxterminal.conf 2010-07-20 00:41:51.096835608 +0200
+@@ -2,3 +2,4 @@
+ fontname=Monospace 10
+ selchars=-A-Za-z0-9,./?%&#:_
+ scrollback=1000
++disablef10=true
+diff -uNr old-lxterminal-0.1.8//data/lxterminal.conf.in lxterminal-0.1.8/data/lxterminal.conf.in
+--- old-lxterminal-0.1.8//data/lxterminal.conf.in 2010-06-22 22:28:48.000000000 +0200
++++ lxterminal-0.1.8/data/lxterminal.conf.in 2010-07-20 00:41:42.824860472 +0200
+@@ -2,3 +2,4 @@
+ fontname=Monospace 10
+ selchars=-A-Za-z0-9,./?%&#:_
+ scrollback=1000
++disablef10=true
diff --git a/lxterminal-0.1.8-fix-alt_n-sf3006779.patch b/lxterminal-0.1.8-fix-alt_n-sf3006779.patch
new file mode 100644
index 0000000..72d7b50
--- /dev/null
+++ b/lxterminal-0.1.8-fix-alt_n-sf3006779.patch
@@ -0,0 +1,711 @@
+diff -uNr old-lxterminal-0.1.8//data/lxterminal-preferences.glade lxterminal-0.1.8/data/lxterminal-preferences.glade
+--- old-lxterminal-0.1.8//data/lxterminal-preferences.glade 2010-07-20 01:13:53.532837321 +0200
++++ lxterminal-0.1.8/data/lxterminal-preferences.glade 1970-01-01 01:00:00.000000000 +0100
+@@ -1,537 +0,0 @@
+-
+-
+-
+-
+-
+-
+-
+-
+diff -uNr old-lxterminal-0.1.8//src/lxterminal.c lxterminal-0.1.8/src/lxterminal.c
+--- old-lxterminal-0.1.8//src/lxterminal.c 2010-07-20 01:13:53.516834944 +0200
++++ lxterminal-0.1.8/src/lxterminal.c 2010-07-20 01:14:24.972842488 +0200
+@@ -68,6 +68,7 @@
+
+ /* Menu and accelerator event handlers. */
+ static void terminal_initialize_switch_tab_accelerator(Term * term);
++static void terminal_set_disable_alt(Term *term, gboolean disable_alt);
+ static void terminal_switch_tab_accelerator(Term * term);
+ static void terminal_new_window_activate_event(GtkAction * action, LXTerminal * terminal);
+ static void terminal_new_window_accelerator(LXTerminal * terminal, guint action, GtkWidget * item);
+@@ -300,7 +301,23 @@
+
+ /* Define the accelerator. */
+ term->closure = g_cclosure_new_swap(G_CALLBACK(terminal_switch_tab_accelerator), term, NULL);
+- gtk_accel_group_connect(term->parent->accel_group, key, mods, GTK_ACCEL_LOCKED, term->closure);
++ if (gtk_accel_group_from_accel_closure(term->closure) == NULL)
++ gtk_accel_group_connect(term->parent->accel_group, key, mods, GTK_ACCEL_LOCKED, term->closure);
++ }
++}
++
++/* whether disable alt-n to switch tabs or not. */
++void terminal_set_disable_alt(Term * term, gboolean disable_alt)
++{
++ if (GTK_IS_ACCEL_GROUP(term->parent->accel_group))
++ {
++ if (disable_alt)
++ {
++ if (term->closure != NULL)
++ gtk_accel_group_disconnect(term->parent->accel_group, term->closure);
++ }
++ else
++ terminal_initialize_switch_tab_accelerator(term);
+ }
+ }
+
+@@ -378,7 +395,9 @@
+ terminal_window_set_fixed_size(terminal);
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(term->parent->notebook), TRUE);
+ }
+- terminal_initialize_switch_tab_accelerator(term);
++
++ /* Disable Alt-n switch tabs or not. */
++ terminal_set_disable_alt(term, terminal->setting->disable_alt);
+ }
+
+ /* Handler for accelerator T. Open a new tab. */
+@@ -936,7 +955,8 @@
+ /* Deallocate a Term structure. */
+ static void terminal_free(Term * term)
+ {
+- gtk_accel_group_disconnect(term->parent->accel_group, term->closure);
++ if ((GTK_IS_ACCEL_GROUP(term->parent->accel_group)) && (term->closure != NULL))
++ gtk_accel_group_disconnect(term->parent->accel_group, term->closure);
+ g_free(term);
+ }
+
+@@ -945,11 +965,11 @@
+ {
+ /* Initialize UI manager. */
+ GtkUIManager * manager = gtk_ui_manager_new();
+- GtkActionGroup * action_group = gtk_action_group_new("MenuBar");
+- gtk_action_group_set_translation_domain(action_group, GETTEXT_PACKAGE);
+- gtk_action_group_add_actions(action_group, menus, MENUBAR_MENU_COUNT, terminal);
+- gtk_action_group_add_actions(action_group, menu_items, MENUBAR_MENUITEM_COUNT, terminal);
+- gtk_ui_manager_insert_action_group(manager, action_group, 0);
++ terminal->action_group = gtk_action_group_new("MenuBar");
++ gtk_action_group_set_translation_domain(terminal->action_group, GETTEXT_PACKAGE);
++ gtk_action_group_add_actions(terminal->action_group, menus, MENUBAR_MENU_COUNT, terminal);
++ gtk_action_group_add_actions(terminal->action_group, menu_items, MENUBAR_MENUITEM_COUNT, terminal);
++ gtk_ui_manager_insert_action_group(manager, terminal->action_group, 0);
+
+ guint merge_id = gtk_ui_manager_new_merge_id(manager);
+ gtk_ui_manager_add_ui(manager, merge_id, "/", "MenuBar", NULL, GTK_UI_MANAGER_MENUBAR, FALSE);
+@@ -1223,7 +1243,6 @@
+
+ /* Initialize accelerators. */
+ terminal_accelerator_initialize(terminal);
+- terminal_initialize_switch_tab_accelerator(term);
+
+ /* Update terminal settings. */
+ terminal_settings_apply(terminal);
+@@ -1248,7 +1267,10 @@
+ /* Apply settings to all windows. */
+ int i;
+ for (i = 0; i < terminal->terms->len; i += 1)
++ {
+ terminal_settings_apply_to_term(terminal, g_ptr_array_index(terminal->terms, i));
++ terminal_set_disable_alt(g_ptr_array_index(terminal->terms, i), terminal->setting->disable_alt);
++ }
+
+ /* Update tab position. */
+ terminal->tab_position = terminal_tab_get_position_id(terminal->setting->tab_position);
+diff -uNr old-lxterminal-0.1.8//src/lxterminal.h lxterminal-0.1.8/src/lxterminal.h
+--- old-lxterminal-0.1.8//src/lxterminal.h 2010-07-20 01:13:53.524842419 +0200
++++ lxterminal-0.1.8/src/lxterminal.h 2010-07-20 01:14:24.976839137 +0200
+@@ -52,6 +52,7 @@
+ GtkWidget * window; /* Toplevel window */
+ GtkWidget * box; /* Vertical box, child of toplevel window */
+ GtkWidget * menu; /* Menu bar, child of vertical box */
++ GtkActionGroup *action_group; /* Action group on this window */
+ GtkAccelGroup * accel_group; /* Accelerator group for accelerators on this window */
+ GtkWidget * notebook; /* Notebook, child of vertical box */
+ GPtrArray * terms; /* Array of pointers to Term structures */
+diff -uNr old-lxterminal-0.1.8//src/preferences.c lxterminal-0.1.8/src/preferences.c
+--- old-lxterminal-0.1.8//src/preferences.c 2010-07-20 01:13:53.508834315 +0200
++++ lxterminal-0.1.8/src/preferences.c 2010-07-20 01:14:24.980837810 +0200
+@@ -41,6 +41,7 @@
+ static void preferences_dialog_hide_close_button_toggled_event(GtkToggleButton * widget, LXTerminal * terminal);
+ static gboolean preferences_dialog_selection_focus_out_event(GtkWidget * widget, GdkEventFocus * event, LXTerminal * terminal);
+ static void preferences_dialog_disable_f10_toggled_event(GtkToggleButton * widget, LXTerminal * terminal);
++static void preferences_dialog_disable_alt_toggled_event(GtkToggleButton * widget, LXTerminal * terminal);
+
+ /* Handler for "response" signal on preferences dialog. */
+ static void preferences_dialog_response_event(GtkWidget * dialog, gint response, LXTerminal * terminal)
+@@ -170,6 +171,13 @@
+ terminal_settings_apply_to_all(terminal);
+ }
+
++/* Handler for "toggled" signal on Disable Alt toggle button. */
++static void preferences_dialog_disable_alt_toggled_event(GtkToggleButton * widget, LXTerminal * terminal)
++{
++ terminal->setting->disable_alt = gtk_toggle_button_get_active(widget);
++ terminal_settings_apply_to_all(terminal);
++}
++
+ /* Convert the user preference on tab position, expressed as a string, to the internal representation.
+ * These have to match the order in the .glade file. */
+ gint terminal_tab_get_position_id(gchar * position)
+@@ -261,6 +269,10 @@
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), setting->disable_f10);
+ g_signal_connect(G_OBJECT(w), "toggled", G_CALLBACK(preferences_dialog_disable_f10_toggled_event), terminal);
+
++ w = GTK_WIDGET(gtk_builder_get_object(builder, "disable_alt"));
++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), setting->disable_alt);
++ g_signal_connect(G_OBJECT(w), "toggled", G_CALLBACK(preferences_dialog_disable_alt_toggled_event), terminal);
++
+ gtk_widget_show_all(dialog);
+ g_object_unref(builder);
+ }
+diff -uNr old-lxterminal-0.1.8//src/setting.c lxterminal-0.1.8/src/setting.c
+--- old-lxterminal-0.1.8//src/setting.c 2010-07-20 01:13:53.520868259 +0200
++++ lxterminal-0.1.8/src/setting.c 2010-07-20 01:14:24.984836622 +0200
+@@ -55,6 +55,7 @@
+ g_key_file_set_boolean(setting->keyfile, "general", "hideclosebutton", setting->hide_close_button);
+ g_key_file_set_string(setting->keyfile, "general", "selchars", setting->word_selection_characters);
+ g_key_file_set_boolean(setting->keyfile, "general", "disablef10", setting->disable_f10);
++ g_key_file_set_boolean(setting->keyfile, "general", "disablealt", setting->disable_alt);
+
+ /* Convert GKeyFile to text and build path to configuration file. */
+ gchar * file_data = g_key_file_to_data(setting->keyfile, NULL, NULL);
+@@ -113,6 +114,7 @@
+ setting->hide_close_button = g_key_file_get_boolean(setting->keyfile, "general", "hideclosebutton", NULL);
+ setting->word_selection_characters = g_key_file_get_string(setting->keyfile, "general", "selchars", NULL);
+ setting->disable_f10 = g_key_file_get_boolean(setting->keyfile, "general", "disablef10", NULL);
++ setting->disable_alt = g_key_file_get_boolean(setting->keyfile, "general", "disablealt", NULL);
+ }
+
+ /* Default configuration strings. */
+diff -uNr old-lxterminal-0.1.8//src/setting.h lxterminal-0.1.8/src/setting.h
+--- old-lxterminal-0.1.8//src/setting.h 2010-07-20 01:13:53.508834315 +0200
++++ lxterminal-0.1.8/src/setting.h 2010-07-20 01:14:24.984836622 +0200
+@@ -42,6 +42,7 @@
+ gboolean hide_close_button; /* True if close buttons are NOT visible */
+ char * word_selection_characters; /* Characters that act as word breaks during selection by word */
+ gboolean disable_f10; /* True if F10 will be passed to program; false if it brings up File menu */
++ gboolean disable_alt; /* True if Alt-n is passed to shell; false if it is used to switch between tabs */
+
+ gboolean geometry_change; /* True if there is a geometry change, until it has been acted on */
+
diff --git a/lxterminal-0.1.8.tar.bz2 b/lxterminal-0.1.8.tar.bz2
new file mode 100644
index 0000000..1001966
--- /dev/null
+++ b/lxterminal-0.1.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86c87bcd275f5d6d59f6e1be3781e26e943693097fa3df694effe596ba7cb901
+size 226335
diff --git a/lxterminal.changes b/lxterminal.changes
index d098d0e..e465868 100644
--- a/lxterminal.changes
+++ b/lxterminal.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul 19 22:28:03 UTC 2010 - andrea@opensuse.org
+
+- new upstream versio 0.1.8
+- removed lxterminal-0.1.7-fix-path.patch now into upstream code
+- port lxterminal-0.1.6-disable-f10.patch to apply on new code,
+ the patch is now lxterminal-0.1.8-disable-f10.patch
+
-------------------------------------------------------------------
Mon Jun 7 14:20:49 UTC 2010 - andrea@opensuse.org
diff --git a/lxterminal.spec b/lxterminal.spec
index 313d4bb..1696c1d 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -1,5 +1,5 @@
#
-# spec file for package lxterminal (Version 0.1.7)
+# spec file for package lxterminal (Version 0.1.8)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,15 +19,19 @@
Name: lxterminal
-Version: 0.1.7
+Version: 0.1.8
Release: 4
Summary: Lightweight LXDE Terminal
Group: System/GUI/LXDE
License: GPL
Url: http://www.lxde.org/
Source0: %name-%version.tar.bz2
-Patch0: %name-0.1.6-disable-f10.patch
-Patch1: %name-0.1.7-fix-path.patch
+# PATCH-FEATURE-OPENSUSE lxterminal-0.1.8-disable-f10.patch andrea@opensuse.org
+# disable f10 shortcut because yast use it
+Patch0: %name-0.1.8-disable-f10.patch
+# PATCH-FIX-UPSTREAM lxterminal-0.1.8-fix-alt_n-sf3006779.patch andrea@opensuse.org
+# upstream patch to fix sf#3006779 (customize fn)
+#Patch1: %name-0.1.8-fix-alt_n-sf3006779.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: fdupes gtk2-devel intltool pkg-config update-desktop-files
BuildRequires: docbook-utils docbook-xsl-stylesheets libxslt-devel vte-devel
@@ -40,7 +44,7 @@ of the LXDE project
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+#%patch1 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -66,6 +70,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
%_datadir/applications/lxterminal.desktop
%dir %_datadir/lxterminal
%_datadir/lxterminal/lxterminal.conf
+%_datadir/lxterminal/lxterminal-preferences.ui
%_mandir/man1/lxterminal.1.gz
%_datadir/pixmaps/lxterminal.png