From f191a13cdf87d0e493a4d66656cf71da7e11038d80fbd309e20cc82db95d10b9 Mon Sep 17 00:00:00 2001 From: andrea florio Date: Mon, 7 Jun 2010 14:17:55 +0000 Subject: [PATCH 1/9] - changed RPM Group to System/GUI/LXDE OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=21 --- lxterminal.changes | 5 +++++ lxterminal.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lxterminal.changes b/lxterminal.changes index e92df24..d098d0e 100644 --- a/lxterminal.changes +++ b/lxterminal.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 7 14:20:49 UTC 2010 - andrea@opensuse.org + +- changed RPM Group to System/GUI/LXDE + ------------------------------------------------------------------- Tue Apr 6 08:19:14 UTC 2010 - andrea@opensuse.org diff --git a/lxterminal.spec b/lxterminal.spec index c743bf8..cd84748 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -22,7 +22,7 @@ Name: lxterminal Version: 0.1.7 Release: 3 Summary: Lightweight LXDE Terminal -Group: System/X11/Utilities +Group: System/GUI/LXDE License: GPL Url: http://www.lxde.org/ Source0: %name-%version.tar.bz2 From 41e38c4792476b7b5ba7eb2eedfc89a46aedb1ab5e381315c806b7765edd6e6a Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 13 Jun 2010 22:41:20 +0000 Subject: [PATCH 2/9] Accepting request 41369 from X11:lxde checked in (request 41369) OBS-URL: https://build.opensuse.org/request/show/41369 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=22 --- lxterminal.changes | 5 ----- lxterminal.spec | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lxterminal.changes b/lxterminal.changes index d098d0e..e92df24 100644 --- a/lxterminal.changes +++ b/lxterminal.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Jun 7 14:20:49 UTC 2010 - andrea@opensuse.org - -- changed RPM Group to System/GUI/LXDE - ------------------------------------------------------------------- Tue Apr 6 08:19:14 UTC 2010 - andrea@opensuse.org diff --git a/lxterminal.spec b/lxterminal.spec index cd84748..c743bf8 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -22,7 +22,7 @@ Name: lxterminal Version: 0.1.7 Release: 3 Summary: Lightweight LXDE Terminal -Group: System/GUI/LXDE +Group: System/X11/Utilities License: GPL Url: http://www.lxde.org/ Source0: %name-%version.tar.bz2 From 537e3dd7c1b5c39d9fd559ab17ee310346d33dffa18471c21997a7d565066cbf Mon Sep 17 00:00:00 2001 From: andrea florio Date: Mon, 19 Jul 2010 22:26:05 +0000 Subject: [PATCH 3/9] OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=23 --- lxterminal-0.1.7.tar.bz2 | 3 --- lxterminal.changes | 5 +++++ lxterminal.spec | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 lxterminal-0.1.7.tar.bz2 diff --git a/lxterminal-0.1.7.tar.bz2 b/lxterminal-0.1.7.tar.bz2 deleted file mode 100644 index ac3e6d3..0000000 --- a/lxterminal-0.1.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98c03a9d29189745a3a8fda171b5f103f6ec275353f4e14849b8bc8b844c5aab -size 213293 diff --git a/lxterminal.changes b/lxterminal.changes index e92df24..d098d0e 100644 --- a/lxterminal.changes +++ b/lxterminal.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 7 14:20:49 UTC 2010 - andrea@opensuse.org + +- changed RPM Group to System/GUI/LXDE + ------------------------------------------------------------------- Tue Apr 6 08:19:14 UTC 2010 - andrea@opensuse.org diff --git a/lxterminal.spec b/lxterminal.spec index c743bf8..313d4bb 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -20,9 +20,9 @@ Name: lxterminal Version: 0.1.7 -Release: 3 +Release: 4 Summary: Lightweight LXDE Terminal -Group: System/X11/Utilities +Group: System/GUI/LXDE License: GPL Url: http://www.lxde.org/ Source0: %name-%version.tar.bz2 From faa23169cd7da9aea1bdfeafc93d654b191a179733db7c01f20939f36e5c59cf Mon Sep 17 00:00:00 2001 From: andrea florio Date: Mon, 19 Jul 2010 22:42:44 +0000 Subject: [PATCH 4/9] OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=24 --- lxterminal-0.1.6-disable-f10.patch | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 lxterminal-0.1.6-disable-f10.patch diff --git a/lxterminal-0.1.6-disable-f10.patch b/lxterminal-0.1.6-disable-f10.patch deleted file mode 100644 index cb73582..0000000 --- a/lxterminal-0.1.6-disable-f10.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -uNr old-lxterminal-0.1.6//data/lxterminal.conf lxterminal-0.1.6/data/lxterminal.conf ---- old-lxterminal-0.1.6//data/lxterminal.conf 2009-07-11 17:18:29.000000000 +0200 -+++ lxterminal-0.1.6/data/lxterminal.conf 2009-12-12 15:56:07.670875633 +0100 -@@ -1,3 +1,4 @@ - [general] - fontname=Monospace 10 - selchars=-A-Za-z0-9,./?%&#:_ -+disablef10=true -diff -uNr old-lxterminal-0.1.6//data/lxterminal.conf.in lxterminal-0.1.6/data/lxterminal.conf.in ---- old-lxterminal-0.1.6//data/lxterminal.conf.in 2008-06-28 10:16:01.000000000 +0200 -+++ lxterminal-0.1.6/data/lxterminal.conf.in 2009-12-12 15:56:00.881878045 +0100 -@@ -1,3 +1,4 @@ - [general] - fontname=Monospace 10 - selchars=-A-Za-z0-9,./?%&#:_ -+disablef10=true From c1579f928adf72b99975ed8f1a5a2819be2a61aa4092ff717a3050b89af385db Mon Sep 17 00:00:00 2001 From: andrea florio Date: Mon, 19 Jul 2010 22:58:58 +0000 Subject: [PATCH 5/9] OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=25 --- lxterminal-0.1.7-fix-path.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 lxterminal-0.1.7-fix-path.patch diff --git a/lxterminal-0.1.7-fix-path.patch b/lxterminal-0.1.7-fix-path.patch deleted file mode 100644 index b347aba..0000000 --- a/lxterminal-0.1.7-fix-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/lxterminal.c -+++ b/src/lxterminal.c -@@ -766,7 +766,7 @@ static Term *terminal_new(LXTerminal *te - if (exec) { - gchar **command; - g_shell_parse_argv(exec, NULL, &command, NULL); -- term->pid = vte_terminal_fork_command(VTE_TERMINAL(term->vte), (const char *)*(command), command, env, "/tmp", FALSE, TRUE, TRUE); -+ term->pid = vte_terminal_fork_command(VTE_TERMINAL(term->vte), (const char *)*(command), command, env, pwd, FALSE, TRUE, TRUE); - g_strfreev(command); - } else { - term->pid = vte_terminal_fork_command(VTE_TERMINAL(term->vte), NULL, NULL, env, pwd, FALSE, TRUE, TRUE); From fa3c0a0fbbdcaf9642f00eeebc16ca19d6e3ba0025eee9dfa326c66f277f1871 Mon Sep 17 00:00:00 2001 From: andrea florio Date: Mon, 19 Jul 2010 23:33:19 +0000 Subject: [PATCH 6/9] - 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 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=26 --- lxterminal-0.1.8-disable-f10.patch | 16 + lxterminal-0.1.8-fix-alt_n-sf3006779.patch | 711 +++++++++++++++++++++ lxterminal-0.1.8.tar.bz2 | 3 + lxterminal.changes | 8 + lxterminal.spec | 15 +- 5 files changed, 748 insertions(+), 5 deletions(-) create mode 100644 lxterminal-0.1.8-disable-f10.patch create mode 100644 lxterminal-0.1.8-fix-alt_n-sf3006779.patch create mode 100644 lxterminal-0.1.8.tar.bz2 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 @@ +- +- +- +- +- +- +- +- +- +- +- +- Top +- +- +- Bottom +- +- +- Left +- +- +- Right +- +- +- +- +- 5 +- normal +- False +- +- +- True +- vertical +- 2 +- +- +- True +- True +- +- +- True +- 8 +- 2 +- 5 +- 3 +- +- +- True +- 1 +- Terminal font +- +- +- +- +- True +- True +- True +- +- +- 1 +- 2 +- +- +- +- +- True +- 1 +- Background +- +- +- 1 +- 2 +- +- +- +- +- True +- True +- True +- True +- #000000000000 +- +- +- 1 +- 2 +- 1 +- 2 +- +- +- +- +- True +- True +- True +- #000000000000 +- +- +- 1 +- 2 +- 2 +- 3 +- +- +- +- +- True +- 1 +- Foreground +- +- +- 2 +- 3 +- +- +- +- +- True +- 1 +- Allow bold font +- +- +- 3 +- 4 +- +- +- +- +- True +- True +- False +- True +- +- +- 1 +- 2 +- 3 +- 4 +- +- +- +- +- True +- 1 +- Cursor blink +- +- +- 4 +- 5 +- +- +- +- +- True +- True +- False +- True +- +- +- 1 +- 2 +- 4 +- 5 +- +- +- +- +- True +- 1 +- Cursor style +- +- +- 5 +- 7 +- +- +- +- +- Block +- True +- True +- False +- True +- True +- +- +- 1 +- 2 +- 5 +- 6 +- +- +- +- +- Underline +- True +- True +- False +- True +- True +- cursor_style_block +- +- +- 1 +- 2 +- 6 +- 7 +- +- +- +- +- True +- 1 +- Audible bell +- +- +- 7 +- 8 +- +- +- +- +- True +- True +- False +- True +- +- +- 1 +- 2 +- 7 +- 8 +- +- +- +- +- +- +- True +- Style +- +- +- False +- +- +- +- +- True +- 5 +- 2 +- 5 +- 3 +- +- +- True +- 1 +- Tab panel position +- +- +- +- +- True +- 1 +- Scrollback lines +- +- +- 1 +- 2 +- +- +- +- +- True +- 1 +- Hide scroll bar +- +- +- 2 +- 3 +- +- +- +- +- True +- 1 +- Hide menu bar +- +- +- 3 +- 4 +- +- +- +- +- True +- True +- False +- True +- +- +- 1 +- 2 +- 3 +- 4 +- +- +- +- +- True +- liststore1 +- +- +- +- 0 +- +- +- +- +- 1 +- 2 +- GTK_SHRINK +- +- +- +- +- True +- True +- • +- scrollback_lines_adjustment +- +- +- 1 +- 2 +- 1 +- 2 +- +- +- +- +- True +- True +- False +- True +- +- +- 1 +- 2 +- 2 +- 3 +- +- +- +- +- True +- 1 +- Hide Close buttons +- +- +- 4 +- 5 +- +- +- +- +- True +- True +- False +- True +- +- +- 1 +- 2 +- 4 +- 5 +- +- +- +- +- 1 +- +- +- +- +- True +- Display +- +- +- 1 +- False +- +- +- +- +- True +- 3 +- 2 +- 5 +- 3 +- +- +- True +- 1 +- Select-by-word characters +- +- +- +- +- True +- 1 +- Disable menu shortcut key (F10 by default) +- +- +- 1 +- 2 +- +- +- +- +- True +- True +- False +- True +- +- +- 1 +- 2 +- 1 +- 2 +- +- +- +- +- True +- 1 +- Disable using Alt-n to switch tabs +- +- +- 2 +- 3 +- +- +- +- +- True +- True +- False +- True +- +- +- 1 +- 2 +- 2 +- 3 +- +- +- +- +- True +- True +- • +- +- +- 1 +- 2 +- +- +- +- +- 2 +- +- +- +- +- True +- Advanced +- +- +- 2 +- False +- +- +- +- +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- +- False +- False +- 1 +- +- +- +- +- False +- end +- 0 +- +- +- +- +- +- Cancel_button +- OK_button +- +- +- +- 1000 +- 100000 +- 10 +- 10 +- +- +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 From 0f400f14561bd826332f8672dbfb2373061f2e887cdaf77d5f063a744be95451 Mon Sep 17 00:00:00 2001 From: andrea florio Date: Tue, 20 Jul 2010 08:07:49 +0000 Subject: [PATCH 7/9] OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=27 --- lxterminal-0.1.8-fix-alt_n-sf3006779.patch | 711 --------------------- 1 file changed, 711 deletions(-) delete mode 100644 lxterminal-0.1.8-fix-alt_n-sf3006779.patch diff --git a/lxterminal-0.1.8-fix-alt_n-sf3006779.patch b/lxterminal-0.1.8-fix-alt_n-sf3006779.patch deleted file mode 100644 index 72d7b50..0000000 --- a/lxterminal-0.1.8-fix-alt_n-sf3006779.patch +++ /dev/null @@ -1,711 +0,0 @@ -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 @@ -- -- -- -- -- -- -- -- -- -- -- -- Top -- -- -- Bottom -- -- -- Left -- -- -- Right -- -- -- -- -- 5 -- normal -- False -- -- -- True -- vertical -- 2 -- -- -- True -- True -- -- -- True -- 8 -- 2 -- 5 -- 3 -- -- -- True -- 1 -- Terminal font -- -- -- -- -- True -- True -- True -- -- -- 1 -- 2 -- -- -- -- -- True -- 1 -- Background -- -- -- 1 -- 2 -- -- -- -- -- True -- True -- True -- True -- #000000000000 -- -- -- 1 -- 2 -- 1 -- 2 -- -- -- -- -- True -- True -- True -- #000000000000 -- -- -- 1 -- 2 -- 2 -- 3 -- -- -- -- -- True -- 1 -- Foreground -- -- -- 2 -- 3 -- -- -- -- -- True -- 1 -- Allow bold font -- -- -- 3 -- 4 -- -- -- -- -- True -- True -- False -- True -- -- -- 1 -- 2 -- 3 -- 4 -- -- -- -- -- True -- 1 -- Cursor blink -- -- -- 4 -- 5 -- -- -- -- -- True -- True -- False -- True -- -- -- 1 -- 2 -- 4 -- 5 -- -- -- -- -- True -- 1 -- Cursor style -- -- -- 5 -- 7 -- -- -- -- -- Block -- True -- True -- False -- True -- True -- -- -- 1 -- 2 -- 5 -- 6 -- -- -- -- -- Underline -- True -- True -- False -- True -- True -- cursor_style_block -- -- -- 1 -- 2 -- 6 -- 7 -- -- -- -- -- True -- 1 -- Audible bell -- -- -- 7 -- 8 -- -- -- -- -- True -- True -- False -- True -- -- -- 1 -- 2 -- 7 -- 8 -- -- -- -- -- -- -- True -- Style -- -- -- False -- -- -- -- -- True -- 5 -- 2 -- 5 -- 3 -- -- -- True -- 1 -- Tab panel position -- -- -- -- -- True -- 1 -- Scrollback lines -- -- -- 1 -- 2 -- -- -- -- -- True -- 1 -- Hide scroll bar -- -- -- 2 -- 3 -- -- -- -- -- True -- 1 -- Hide menu bar -- -- -- 3 -- 4 -- -- -- -- -- True -- True -- False -- True -- -- -- 1 -- 2 -- 3 -- 4 -- -- -- -- -- True -- liststore1 -- -- -- -- 0 -- -- -- -- -- 1 -- 2 -- GTK_SHRINK -- -- -- -- -- True -- True -- • -- scrollback_lines_adjustment -- -- -- 1 -- 2 -- 1 -- 2 -- -- -- -- -- True -- True -- False -- True -- -- -- 1 -- 2 -- 2 -- 3 -- -- -- -- -- True -- 1 -- Hide Close buttons -- -- -- 4 -- 5 -- -- -- -- -- True -- True -- False -- True -- -- -- 1 -- 2 -- 4 -- 5 -- -- -- -- -- 1 -- -- -- -- -- True -- Display -- -- -- 1 -- False -- -- -- -- -- True -- 3 -- 2 -- 5 -- 3 -- -- -- True -- 1 -- Select-by-word characters -- -- -- -- -- True -- 1 -- Disable menu shortcut key (F10 by default) -- -- -- 1 -- 2 -- -- -- -- -- True -- True -- False -- True -- -- -- 1 -- 2 -- 1 -- 2 -- -- -- -- -- True -- 1 -- Disable using Alt-n to switch tabs -- -- -- 2 -- 3 -- -- -- -- -- True -- True -- False -- True -- -- -- 1 -- 2 -- 2 -- 3 -- -- -- -- -- True -- True -- • -- -- -- 1 -- 2 -- -- -- -- -- 2 -- -- -- -- -- True -- Advanced -- -- -- 2 -- False -- -- -- -- -- 1 -- -- -- -- -- True -- end -- -- -- gtk-cancel -- True -- True -- True -- True -- -- -- False -- False -- 0 -- -- -- -- -- gtk-ok -- True -- True -- True -- True -- -- -- False -- False -- 1 -- -- -- -- -- False -- end -- 0 -- -- -- -- -- -- Cancel_button -- OK_button -- -- -- -- 1000 -- 100000 -- 10 -- 10 -- -- -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 */ - From de0d7acd8f158be4165ead7cf9d84697b2f120e5d38bb6676cdea5e6a8dc4ecd Mon Sep 17 00:00:00 2001 From: andrea florio Date: Tue, 20 Jul 2010 08:14:29 +0000 Subject: [PATCH 8/9] - added lxterminal-0.1.8-fix-alt_n-sf3006779.patch (backport from upstream git) to fix bug sf#3006779 - split out lang package OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=28 --- lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 | 3 +++ lxterminal.changes | 7 +++++++ lxterminal.spec | 13 +++++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 diff --git a/lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 b/lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 new file mode 100644 index 0000000..c8389f3 --- /dev/null +++ b/lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12ab9db3af00dea0a56b65702eda672f9e5ea60c54c4beed501c967c3f84d8a1 +size 34507 diff --git a/lxterminal.changes b/lxterminal.changes index e465868..541c097 100644 --- a/lxterminal.changes +++ b/lxterminal.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 20 07:42:08 UTC 2010 - andrea@opensuse.org + +- added lxterminal-0.1.8-fix-alt_n-sf3006779.patch (backport from + upstream git) to fix bug sf#3006779 +- split out lang package + ------------------------------------------------------------------- Mon Jul 19 22:28:03 UTC 2010 - andrea@opensuse.org diff --git a/lxterminal.spec b/lxterminal.spec index 1696c1d..fd8ff89 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -30,21 +30,24 @@ Source0: %name-%version.tar.bz2 # 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 +# upstream patch to fix sf#3006779 (enable/disable Alt+n) +Patch1: %name-0.1.8-fix-alt_n-sf3006779.patch.bz2 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 +Recommends: %name-lang %description LXTerminal is a lightweight Terminal Emulator. This package even if DE independent it's part of the LXDE project +%lang_package + %prep %setup -q %patch0 -p1 -#%patch1 -p1 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -63,7 +66,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS" %clean %__rm -rf $RPM_BUILD_ROOT -%files -f %{name}.lang +%files %defattr(-,root,root,0755) %doc COPYING %_bindir/%name @@ -74,4 +77,6 @@ export CXXFLAGS="$RPM_OPT_FLAGS" %_mandir/man1/lxterminal.1.gz %_datadir/pixmaps/lxterminal.png +%files lang -f %name.lang + %changelog From f242a738646982fff48432d2107af4d6aefd549fea42117114bec11af4d9da7e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Jul 2010 18:56:53 +0000 Subject: [PATCH 9/9] Accepting request 43462 from X11:lxde checked in (request 43462) OBS-URL: https://build.opensuse.org/request/show/43462 OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=29 --- lxterminal.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lxterminal.spec b/lxterminal.spec index fd8ff89..75fa79a 100644 --- a/lxterminal.spec +++ b/lxterminal.spec @@ -20,7 +20,7 @@ Name: lxterminal Version: 0.1.8 -Release: 4 +Release: 1 Summary: Lightweight LXDE Terminal Group: System/GUI/LXDE License: GPL @@ -31,19 +31,19 @@ Source0: %name-%version.tar.bz2 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 (enable/disable Alt+n) -Patch1: %name-0.1.8-fix-alt_n-sf3006779.patch.bz2 +Patch1: %name-0.1.8-fix-alt_n-sf3006779.patch.bz2 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 -Recommends: %name-lang +Recommends: %name-lang %description LXTerminal is a lightweight Terminal Emulator. This package even if DE independent it's part of the LXDE project -%lang_package +%lang_package %prep %setup -q %patch0 -p1