From 2eb2767c209e818150277c38304d7317080a52c6312b3ea603a086eebe903828 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Tue, 31 Aug 2010 06:34:12 +0000
Subject: [PATCH 01/18] - fixed build failure on factory (vte 0.25.90) using  
 -UVTE_SEAL_ENABLE as CFLAG

OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=33
---
 lxterminal.changes | 6 ++++++
 lxterminal.spec    | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lxterminal.changes b/lxterminal.changes
index 5e0ac6c..6fb0bfe 100644
--- a/lxterminal.changes
+++ b/lxterminal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 31 06:32:07 UTC 2010 - andrea@opensuse.org
+
+- fixed build failure on factory (vte 0.25.90) using 
+  -UVTE_SEAL_ENABLE as CFLAG
+
 -------------------------------------------------------------------
 Thu Jul 29 08:30:55 UTC 2010 - andrea@opensuse.org
 
diff --git a/lxterminal.spec b/lxterminal.spec
index 9078d87..4d3ebcb 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -59,8 +59,11 @@ of the LXDE project
 %patch3 -p1
 
 %build
+%if %suse_version > 1130
+export CFLAGS="$RPM_OPT_FLAGS -UVTE_SEAL_ENABLE"
+%else
 export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
+%endif
 %configure --enable-man
 %__make %{?jobs:-j%jobs}
 

From 5bac6aba26ce1f81cfad2264d3fe3647cca50026fcd5b7589b6c575faf2ac917 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Tue, 31 Aug 2010 08:50:37 +0000
Subject: [PATCH 02/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=34

---
 lxterminal.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxterminal.spec b/lxterminal.spec
index 4d3ebcb..2019386 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -60,7 +60,7 @@ of the LXDE project
 
 %build
 %if %suse_version > 1130
-export CFLAGS="$RPM_OPT_FLAGS -UVTE_SEAL_ENABLE"
+export CFLAGS="$RPM_OPT_FLAGS -U_VTE_SEAL_ENABLE"
 %else
 export CFLAGS="$RPM_OPT_FLAGS"
 %endif

From 53edee64b0268ba70a77851bed0384ddf04a1304095f99f37a977bea1846d5d6 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Tue, 31 Aug 2010 09:05:30 +0000
Subject: [PATCH 03/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=35

---
 lxterminal.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxterminal.spec b/lxterminal.spec
index 2019386..4d3ebcb 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -60,7 +60,7 @@ of the LXDE project
 
 %build
 %if %suse_version > 1130
-export CFLAGS="$RPM_OPT_FLAGS -U_VTE_SEAL_ENABLE"
+export CFLAGS="$RPM_OPT_FLAGS -UVTE_SEAL_ENABLE"
 %else
 export CFLAGS="$RPM_OPT_FLAGS"
 %endif

From bbd2c2ac75308ad4d6cdc8c885141eb82d4f44e3c4072c7f6bc42f33b08e9e91 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Tue, 31 Aug 2010 09:20:18 +0000
Subject: [PATCH 04/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=36

---
 lxterminal.changes | 6 ------
 lxterminal.spec    | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/lxterminal.changes b/lxterminal.changes
index 6fb0bfe..5e0ac6c 100644
--- a/lxterminal.changes
+++ b/lxterminal.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Tue Aug 31 06:32:07 UTC 2010 - andrea@opensuse.org
-
-- fixed build failure on factory (vte 0.25.90) using 
-  -UVTE_SEAL_ENABLE as CFLAG
-
 -------------------------------------------------------------------
 Thu Jul 29 08:30:55 UTC 2010 - andrea@opensuse.org
 
diff --git a/lxterminal.spec b/lxterminal.spec
index 4d3ebcb..5fe159b 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -59,11 +59,7 @@ of the LXDE project
 %patch3 -p1
 
 %build
-%if %suse_version > 1130
-export CFLAGS="$RPM_OPT_FLAGS -UVTE_SEAL_ENABLE"
-%else
 export CFLAGS="$RPM_OPT_FLAGS"
-%endif
 %configure --enable-man
 %__make %{?jobs:-j%jobs}
 

From 4115f7e0f723fae801f94a4fd10b4ddef69d9485791e45af4297c8b90d062754 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Wed, 1 Sep 2010 19:09:20 +0000
Subject: [PATCH 05/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=37

---
 lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 | 3 ---
 1 file changed, 3 deletions(-)
 delete 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
deleted file mode 100644
index c8389f3..0000000
--- a/lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12ab9db3af00dea0a56b65702eda672f9e5ea60c54c4beed501c967c3f84d8a1
-size 34507

From 9e1b18c7e9d2386dd38ce3e930383ee7c37672feec4b6911effb8348bff2048e Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Wed, 1 Sep 2010 19:09:27 +0000
Subject: [PATCH 06/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=38

---
 ...l-0.1.8-fix_alt-key_after_tab_delete.patch | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch

diff --git a/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch b/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch
deleted file mode 100644
index e2f63be..0000000
--- a/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 86fbd89e295dfd7dfdc3a4ac838e3aca524dd02c Mon Sep 17 00:00:00 2001
-From: Marty Jack <martyj@linux.local>
-Date: Wed, 28 Jul 2010 17:30:47 -0400
-Subject: [PATCH] Fix Alt-key assignment after tab deleted (Bug3036189; Patch3036253, Ideal Shang)
-
----
- src/lxterminal.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/lxterminal.c b/src/lxterminal.c
-index a263150..9f89bb4 100644
---- a/src/lxterminal.c
-+++ b/src/lxterminal.c
-@@ -737,6 +737,9 @@ static void terminal_child_exited_event(VteTerminal * vte, Term * term)
-         {
-             Term * t = g_ptr_array_index(terminal->terms, i);
-             t->index -= 1;
-+            if ((GTK_IS_ACCEL_GROUP(t->parent->accel_group)) && (t->closure != NULL))
-+                gtk_accel_group_disconnect(t->parent->accel_group, t->closure);
-+            terminal_set_disable_alt(t, t->parent->setting->disable_alt);
-         }
- 
-         /* Delete the tab and free the Term structure. */
--- 
-1.6.3
\ No newline at end of file

From c30c2db5e7868d98deef51011db1c9eb8849093ae23c11852abbc7f61faa5b2e Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Wed, 1 Sep 2010 19:09:34 +0000
Subject: [PATCH 07/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=39

---
 ...rminal-0.1.8-hide_menu_bar-sf3032519.patch | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 lxterminal-0.1.8-hide_menu_bar-sf3032519.patch

diff --git a/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch b/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch
deleted file mode 100644
index 7580d9d..0000000
--- a/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/lxterminal.c b/src/lxterminal.c
-index dc63796..a263150 100644
---- a/src/lxterminal.c
-+++ b/src/lxterminal.c
-@@ -1244,12 +1244,12 @@ LXTerminal * lxterminal_initialize(LXTermWindow * lxtermwin, CommandArguments *
-     /* Initialize accelerators. */
-     terminal_accelerator_initialize(terminal);
- 
--    /* Update terminal settings. */
--    terminal_settings_apply(terminal);
--
-     /* Show the widget, so it is realized and has a window. */
-     gtk_widget_show_all(terminal->window);
- 
-+    /* Update terminal settings. */
-+    terminal_settings_apply(terminal);
-+
-     /* Initialize the geometry hints. */
-     gdk_window_get_geometry_hints(GTK_WIDGET(term->vte)->window, &terminal->geometry, &terminal->geometry_mask);
- 

From 7729e8d91d77a46e72f99aba0669a02641376163d54eed63e8545156e4171132 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Wed, 1 Sep 2010 19:09:40 +0000
Subject: [PATCH 08/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=40

---
 lxterminal-0.1.8.tar.bz2 | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 lxterminal-0.1.8.tar.bz2

diff --git a/lxterminal-0.1.8.tar.bz2 b/lxterminal-0.1.8.tar.bz2
deleted file mode 100644
index 1001966..0000000
--- a/lxterminal-0.1.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86c87bcd275f5d6d59f6e1be3781e26e943693097fa3df694effe596ba7cb901
-size 226335

From 2f33d390c38511469020daf8fd47b32a16045eff6929370d47d739edb21c68e7 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Wed, 1 Sep 2010 19:10:04 +0000
Subject: [PATCH 09/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=41

---
 lxterminal-0.1.9.tar.gz | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 lxterminal-0.1.9.tar.gz

diff --git a/lxterminal-0.1.9.tar.gz b/lxterminal-0.1.9.tar.gz
new file mode 100644
index 0000000..0ae3ac3
--- /dev/null
+++ b/lxterminal-0.1.9.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:847676534977c30b671e7d3225e2274a9272aa967ef4a56b75594b1df9be5c68
+size 280846

From cac6f4f83a70f524bf1da1048957f9e8d249a415735895c1cc9ebcbb72d8c949 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Wed, 1 Sep 2010 19:11:32 +0000
Subject: [PATCH 10/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=42

---
 lxterminal.changes | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lxterminal.changes b/lxterminal.changes
index 5e0ac6c..aee8bf9 100644
--- a/lxterminal.changes
+++ b/lxterminal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 01 21:10:55 UTC 2010 - andrea@opensuse.org
+
+- new upstream version 0.1.9
+- removed patches that taken from upstream git code
+
 -------------------------------------------------------------------
 Thu Jul 29 08:30:55 UTC 2010 - andrea@opensuse.org
 

From b1f1f1fc381ae26b82ae8f6df735285cabe345113eef3b6f8405c5ced75d39f0 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Wed, 1 Sep 2010 19:15:22 +0000
Subject: [PATCH 11/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=43

---
 lxterminal.spec | 90 -------------------------------------------------
 1 file changed, 90 deletions(-)
 delete mode 100644 lxterminal.spec

diff --git a/lxterminal.spec b/lxterminal.spec
deleted file mode 100644
index 5fe159b..0000000
--- a/lxterminal.spec
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# spec file for package lxterminal (Version 0.1.8)
-#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-
-Name:           lxterminal
-Version:        0.1.8
-Release:        2
-Summary:        Lightweight LXDE Terminal
-Group:          System/GUI/LXDE
-License:        GPL
-Url:            http://www.lxde.org/
-Source0:        %name-%version.tar.bz2
-# 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 (enable/disable Alt+n)
-Patch1:         %name-0.1.8-fix-alt_n-sf3006779.patch.bz2
-# PATCH-FIX-UPSTREAM lxterminal-0.1.8-hide_menu_bar-sf3032519.patch andrea@opensuse.org
-# upstream patch to fix sf#3032519 if toggle on hide menu bar in preference, then exit
-# and restart lxterminal, lxterminal will not hide menu bar, This patch fix this problem
-Patch2:         %name-0.1.8-hide_menu_bar-sf3032519.patch
-# PATCH-FIX-UPSTREAM lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch andrea@opensuse.org
-# upstream patch to fix sf#3036189 Fix Alt-key assignment after tab deleted
-Patch3:         %name-0.1.8-fix_alt-key_after_tab_delete.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
-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
-%patch2 -p1
-%patch3 -p1
-
-%build
-export CFLAGS="$RPM_OPT_FLAGS"
-%configure --enable-man
-%__make %{?jobs:-j%jobs}
-
-%install
-%makeinstall
-# remove not available languages
-%__rm -rf %buildroot/%_datadir/locale/{frp,es_VE,ur_PK}
-%suse_update_desktop_file %name System
-%find_lang %{name}
-%fdupes -s %{buildroot}
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,0755)
-%doc COPYING
-%_bindir/%name
-%_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
-
-%files lang -f %name.lang
-
-%changelog

From c114d8ca4d07eb9e638bfdfaf62dbcd3bda3ba2dbaf25d275e17cdd17b165b3f Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Wed, 1 Sep 2010 19:15:41 +0000
Subject: [PATCH 12/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=44

---
 lxterminal.spec | 77 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 lxterminal.spec

diff --git a/lxterminal.spec b/lxterminal.spec
new file mode 100644
index 0000000..f7b52ef
--- /dev/null
+++ b/lxterminal.spec
@@ -0,0 +1,77 @@
+#
+# spec file for package lxterminal (Version 0.1.9)
+#
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+
+Name:           lxterminal
+Version:        0.1.9
+Release:        2
+Summary:        Lightweight LXDE Terminal
+Group:          System/GUI/LXDE
+License:        GPL
+Url:            http://www.lxde.org/
+Source0:        %name-%version.tar.gz
+# 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
+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
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+%configure --enable-man
+%__make %{?jobs:-j%jobs}
+
+%install
+%makeinstall
+# remove not available languages
+%__rm -rf %buildroot/%_datadir/locale/{frp,es_VE,ur_PK}
+%suse_update_desktop_file %name System
+%find_lang %{name}
+%fdupes -s %{buildroot}
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,0755)
+%doc COPYING
+%_bindir/%name
+%_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
+
+%files lang -f %name.lang
+
+%changelog

From df02afe212c02349a2f61fc9eef9a1a9c365abc7e4fe2b64811289ceaba0fc6d Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Wed, 1 Sep 2010 21:35:50 +0000
Subject: [PATCH 13/18] OBS-URL:
 https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=45

---
 lxterminal-0.1.9.tar.bz2 |   3 +
 lxterminal-0.1.9.tar.gz  |   3 -
 lxterminal.spec          | 154 +++++++++++++++++++--------------------
 3 files changed, 80 insertions(+), 80 deletions(-)
 create mode 100644 lxterminal-0.1.9.tar.bz2
 delete mode 100644 lxterminal-0.1.9.tar.gz

diff --git a/lxterminal-0.1.9.tar.bz2 b/lxterminal-0.1.9.tar.bz2
new file mode 100644
index 0000000..2edcce2
--- /dev/null
+++ b/lxterminal-0.1.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12d158019a4144361f87df6334bc7c48e4337db5f2f870e9d4ceafe2618faa53
+size 227802
diff --git a/lxterminal-0.1.9.tar.gz b/lxterminal-0.1.9.tar.gz
deleted file mode 100644
index 0ae3ac3..0000000
--- a/lxterminal-0.1.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:847676534977c30b671e7d3225e2274a9272aa967ef4a56b75594b1df9be5c68
-size 280846
diff --git a/lxterminal.spec b/lxterminal.spec
index f7b52ef..e37877f 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -1,77 +1,77 @@
-#
-# spec file for package lxterminal (Version 0.1.9)
-#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-
-Name:           lxterminal
-Version:        0.1.9
-Release:        2
-Summary:        Lightweight LXDE Terminal
-Group:          System/GUI/LXDE
-License:        GPL
-Url:            http://www.lxde.org/
-Source0:        %name-%version.tar.gz
-# 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
-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
-
-%build
-export CFLAGS="$RPM_OPT_FLAGS"
-%configure --enable-man
-%__make %{?jobs:-j%jobs}
-
-%install
-%makeinstall
-# remove not available languages
-%__rm -rf %buildroot/%_datadir/locale/{frp,es_VE,ur_PK}
-%suse_update_desktop_file %name System
-%find_lang %{name}
-%fdupes -s %{buildroot}
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,0755)
-%doc COPYING
-%_bindir/%name
-%_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
-
-%files lang -f %name.lang
-
-%changelog
+#
+# spec file for package lxterminal (Version 0.1.9)
+#
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+# norootforbuild
+
+
+Name:           lxterminal
+Version:        0.1.9
+Release:        2
+Summary:        Lightweight LXDE Terminal
+Group:          System/GUI/LXDE
+License:        GPL
+Url:            http://www.lxde.org/
+Source0:        %name-%version.tar.bz2
+# 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
+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
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+%configure --enable-man
+%__make %{?jobs:-j%jobs}
+
+%install
+%makeinstall
+# remove not available languages
+%__rm -rf %buildroot/%_datadir/locale/{frp,es_VE,ur_PK}
+%suse_update_desktop_file %name System
+%find_lang %{name}
+%fdupes -s %{buildroot}
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,0755)
+%doc COPYING
+%_bindir/%name
+%_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
+
+%files lang -f %name.lang
+
+%changelog

From 07533424b6dbabebde558eac8b8645df408a6db1b5926d9fc6c4beea25e2bdd3 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Thu, 2 Sep 2010 17:40:12 +0000
Subject: [PATCH 14/18] Accepting request 47022 from
 home:bmanojlovic:branches:X11:lxde

Copy from home:bmanojlovic:branches:X11:lxde/lxterminal via accept of submit request 47022 revision 2.
Request was accepted with message:
thanks

OBS-URL: https://build.opensuse.org/request/show/47022
OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=46
---
 lxterminal-fix-char_widthheight.patch | 46 +++++++++++++++++++++++++++
 lxterminal.spec                       |  2 ++
 2 files changed, 48 insertions(+)
 create mode 100644 lxterminal-fix-char_widthheight.patch

diff --git a/lxterminal-fix-char_widthheight.patch b/lxterminal-fix-char_widthheight.patch
new file mode 100644
index 0000000..94954a2
--- /dev/null
+++ b/lxterminal-fix-char_widthheight.patch
@@ -0,0 +1,46 @@
+Index: src/lxterminal.c
+===================================================================
+--- src/lxterminal.c.orig	2010-08-17 02:20:35.000000000 +0200
++++ src/lxterminal.c	2010-09-02 19:11:47.792423947 +0200
+@@ -259,8 +259,8 @@ static void terminal_geometry_restore(Te
+         vte_terminal_get_column_count(VTE_TERMINAL(term->vte)),
+         vte_terminal_get_row_count(VTE_TERMINAL(term->vte)));
+     gtk_window_resize(GTK_WINDOW(term->parent->window),
+-        border->left + VTE_TERMINAL(term->vte)->char_width,
+-        border->top + VTE_TERMINAL(term->vte)->char_height);
++        border->left + vte_terminal_get_char_width(VTE_TERMINAL(term->vte)),
++        border->top + vte_terminal_get_char_height(VTE_TERMINAL(term->vte)));
+     gtk_border_free(border);
+ }
+ 
+@@ -632,8 +632,8 @@ static gboolean terminal_window_size_req
+         Term * term = g_ptr_array_index(terminal->terms, 0);
+         GtkBorder * border = terminal_get_border(term);
+         GdkGeometry hints;
+-        hints.width_inc = VTE_TERMINAL(term->vte)->char_width;
+-        hints.height_inc = VTE_TERMINAL(term->vte)->char_height;
++        hints.width_inc = vte_terminal_get_char_width(VTE_TERMINAL(term->vte));
++        hints.height_inc = vte_terminal_get_char_height(VTE_TERMINAL(term->vte));
+         hints.base_width = border->left;
+         hints.base_height = border->top;
+         hints.min_width = hints.base_width + hints.width_inc * 4;
+@@ -803,8 +803,8 @@ static gboolean terminal_vte_button_pres
+         GtkBorder * border = terminal_get_border(term);
+         gint tag;
+         gchar * match = vte_terminal_match_check(vte,
+-            (event->x - border->left) / vte->char_width,
+-            (event->y - border->top) / vte->char_height,
++            (event->x - border->left) / vte_terminal_get_char_width(vte),
++            (event->y - border->top) / vte_terminal_get_char_height(vte),
+             &tag);
+         gtk_border_free(border);
+ 
+@@ -929,7 +929,7 @@ static Term * terminal_new(LXTerminal *
+     gtk_widget_show_all(term->tab);
+ 
+     /* Set up scrollbar. */
+-    gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), VTE_TERMINAL(term->vte)->adjustment);
++    gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), vte_terminal_get_adjustment(VTE_TERMINAL(term->vte)));
+ 
+     /* Fork the process that will have the VTE as its controlling terminal. */
+     if (exec != NULL)
diff --git a/lxterminal.spec b/lxterminal.spec
index e37877f..d920d02 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -29,6 +29,7 @@ Source0:        %name-%version.tar.bz2
 # 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
+Patch1:		%name-fix-char_widthheight.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
@@ -44,6 +45,7 @@ of the LXDE project
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"

From c2a5f6dc8201e4d1f7da9078602fe9779123f26a3899735cf7c9f5b181b4ca23 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Thu, 2 Sep 2010 17:46:59 +0000
Subject: [PATCH 15/18] - added lxterminal-0.1.9-fix-char_widthheight.patch to
 fix   failure cause of vte deprecated API (thanks BManojlovic)

OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=47
---
 ...xterminal-0.1.9-fix-char_widthheight.patch | 46 +++++++++++++++----
 lxterminal.changes                            |  6 +++
 lxterminal.spec                               |  6 ++-
 3 files changed, 46 insertions(+), 12 deletions(-)
 rename lxterminal-fix-char_widthheight.patch => lxterminal-0.1.9-fix-char_widthheight.patch (58%)

diff --git a/lxterminal-fix-char_widthheight.patch b/lxterminal-0.1.9-fix-char_widthheight.patch
similarity index 58%
rename from lxterminal-fix-char_widthheight.patch
rename to lxterminal-0.1.9-fix-char_widthheight.patch
index 94954a2..282d3ca 100644
--- a/lxterminal-fix-char_widthheight.patch
+++ b/lxterminal-0.1.9-fix-char_widthheight.patch
@@ -1,30 +1,53 @@
-Index: src/lxterminal.c
-===================================================================
---- src/lxterminal.c.orig	2010-08-17 02:20:35.000000000 +0200
-+++ src/lxterminal.c	2010-09-02 19:11:47.792423947 +0200
-@@ -259,8 +259,8 @@ static void terminal_geometry_restore(Te
+From 2cda6d2217f82cc993f4758ed44ef74c61f729ba Mon Sep 17 00:00:00 2001
+From: Andrea Florio <andrea@opensuse.org>
+Date: Thu, 2 Sep 2010 19:34:52 +0200
+Subject: [PATCH] fixed vte failure because of deprecated API
+
+---
+ configure.ac     |    2 +-
+ src/lxterminal.c |   14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7458f21..bf0612e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@ AC_ARG_ENABLE(man,
+ # Checks for libraries.
+ PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.6.0])
+ PKG_CHECK_MODULES(gtk, [gtk+-2.0 >= 2.12.0])
+-PKG_CHECK_MODULES(vte, [vte >= 0.17.1])
++PKG_CHECK_MODULES(vte, [vte >= 0.20.0])
+ CFLAGS="$CFLAGS $glib_CFLAGS $gtk_CFLAGS $vte_CFLAGS"
+ LIBS="$LIBS $glib_LIBS $gtk_LIBS $vte_LIBS"
+ 
+diff --git a/src/lxterminal.c b/src/lxterminal.c
+index dcae22a..da232b1 100644
+--- a/src/lxterminal.c
++++ b/src/lxterminal.c
+@@ -259,8 +259,8 @@ static void terminal_geometry_restore(Term * term)
          vte_terminal_get_column_count(VTE_TERMINAL(term->vte)),
          vte_terminal_get_row_count(VTE_TERMINAL(term->vte)));
      gtk_window_resize(GTK_WINDOW(term->parent->window),
 -        border->left + VTE_TERMINAL(term->vte)->char_width,
 -        border->top + VTE_TERMINAL(term->vte)->char_height);
-+        border->left + vte_terminal_get_char_width(VTE_TERMINAL(term->vte)),
++        border->left + vte_terminal_get_char_width(VTE_TERMINAL(term->vte)),  
 +        border->top + vte_terminal_get_char_height(VTE_TERMINAL(term->vte)));
      gtk_border_free(border);
  }
  
-@@ -632,8 +632,8 @@ static gboolean terminal_window_size_req
+@@ -632,8 +632,8 @@ static gboolean terminal_window_size_request_event(GtkWidget * widget, GtkRequis
          Term * term = g_ptr_array_index(terminal->terms, 0);
          GtkBorder * border = terminal_get_border(term);
          GdkGeometry hints;
 -        hints.width_inc = VTE_TERMINAL(term->vte)->char_width;
 -        hints.height_inc = VTE_TERMINAL(term->vte)->char_height;
-+        hints.width_inc = vte_terminal_get_char_width(VTE_TERMINAL(term->vte));
++        hints.width_inc = vte_terminal_get_char_width(VTE_TERMINAL(term->vte));  
 +        hints.height_inc = vte_terminal_get_char_height(VTE_TERMINAL(term->vte));
          hints.base_width = border->left;
          hints.base_height = border->top;
          hints.min_width = hints.base_width + hints.width_inc * 4;
-@@ -803,8 +803,8 @@ static gboolean terminal_vte_button_pres
+@@ -803,8 +803,8 @@ static gboolean terminal_vte_button_press_event(VteTerminal * vte, GdkEventButto
          GtkBorder * border = terminal_get_border(term);
          gint tag;
          gchar * match = vte_terminal_match_check(vte,
@@ -35,7 +58,7 @@ Index: src/lxterminal.c
              &tag);
          gtk_border_free(border);
  
-@@ -929,7 +929,7 @@ static Term * terminal_new(LXTerminal *
+@@ -929,7 +929,7 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
      gtk_widget_show_all(term->tab);
  
      /* Set up scrollbar. */
@@ -44,3 +67,6 @@ Index: src/lxterminal.c
  
      /* Fork the process that will have the VTE as its controlling terminal. */
      if (exec != NULL)
+-- 
+1.6.3
+
diff --git a/lxterminal.changes b/lxterminal.changes
index aee8bf9..0ca31c1 100644
--- a/lxterminal.changes
+++ b/lxterminal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep  2 17:42:41 UTC 2010 - andrea@opensuse.org
+
+- added lxterminal-0.1.9-fix-char_widthheight.patch to fix
+  failure cause of vte deprecated API (thanks BManojlovic) 
+
 -------------------------------------------------------------------
 Wed Sep 01 21:10:55 UTC 2010 - andrea@opensuse.org
 
diff --git a/lxterminal.spec b/lxterminal.spec
index d920d02..7fbead6 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -29,7 +29,9 @@ Source0:        %name-%version.tar.bz2
 # 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
-Patch1:		%name-fix-char_widthheight.patch
+# PATCH-FEATURE-UPSTREAM lxterminal-0.1.9-fix-char_widthheight.patch andrea@opensuse.org
+# fixed failure because of vte deprecated API
+Patch1:		%name-0.1.9-fix-char_widthheight.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
@@ -45,7 +47,7 @@ of the LXDE project
 %prep
 %setup -q
 %patch0 -p1
-%patch1
+%patch1 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"

From ff32ee17c3e4a49ff8507e9929c565df903bdfc19e6a68383770d400673a3c41 Mon Sep 17 00:00:00 2001
From: andrea florio <andrea@opensuse.org>
Date: Tue, 7 Sep 2010 15:09:17 +0000
Subject: [PATCH 16/18] - fixed mistake in preferences file write sf#3056693  
 - translations updates   - fix next/prev tab key shortcuts leave garbage
 characters     in window problem sf#3036190

OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=48
---
 lxterminal.changes | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lxterminal.changes b/lxterminal.changes
index 0ca31c1..9e24143 100644
--- a/lxterminal.changes
+++ b/lxterminal.changes
@@ -8,6 +8,10 @@ Thu Sep  2 17:42:41 UTC 2010 - andrea@opensuse.org
 Wed Sep 01 21:10:55 UTC 2010 - andrea@opensuse.org
 
 - new upstream version 0.1.9
+  - fixed mistake in preferences file write sf#3056693
+  - translations updates
+  - fix next/prev tab key shortcuts leave garbage characters
+    in window problem sf#3036190
 - removed patches that taken from upstream git code
 
 -------------------------------------------------------------------

From 5172419613e05a465ae638433f8f7f078565180d52c42307538d21be440a1c60 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 13 Sep 2010 10:20:04 +0000
Subject: [PATCH 17/18] Accepting request 47395 from X11:lxde

checked in (request 47395)

OBS-URL: https://build.opensuse.org/request/show/47395
OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=49
---
 ...rminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 |  3 +
 ...l-0.1.8-fix_alt-key_after_tab_delete.patch | 25 +++++++
 ...rminal-0.1.8-hide_menu_bar-sf3032519.patch | 20 ++++++
 lxterminal-0.1.8.tar.bz2                      |  3 +
 lxterminal-0.1.9-fix-char_widthheight.patch   | 72 -------------------
 lxterminal-0.1.9.tar.bz2                      |  3 -
 lxterminal.changes                            | 16 -----
 lxterminal.spec                               | 20 ++++--
 8 files changed, 66 insertions(+), 96 deletions(-)
 create mode 100644 lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2
 create mode 100644 lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch
 create mode 100644 lxterminal-0.1.8-hide_menu_bar-sf3032519.patch
 create mode 100644 lxterminal-0.1.8.tar.bz2
 delete mode 100644 lxterminal-0.1.9-fix-char_widthheight.patch
 delete mode 100644 lxterminal-0.1.9.tar.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-0.1.8-fix_alt-key_after_tab_delete.patch b/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch
new file mode 100644
index 0000000..e2f63be
--- /dev/null
+++ b/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch
@@ -0,0 +1,25 @@
+From 86fbd89e295dfd7dfdc3a4ac838e3aca524dd02c Mon Sep 17 00:00:00 2001
+From: Marty Jack <martyj@linux.local>
+Date: Wed, 28 Jul 2010 17:30:47 -0400
+Subject: [PATCH] Fix Alt-key assignment after tab deleted (Bug3036189; Patch3036253, Ideal Shang)
+
+---
+ src/lxterminal.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/lxterminal.c b/src/lxterminal.c
+index a263150..9f89bb4 100644
+--- a/src/lxterminal.c
++++ b/src/lxterminal.c
+@@ -737,6 +737,9 @@ static void terminal_child_exited_event(VteTerminal * vte, Term * term)
+         {
+             Term * t = g_ptr_array_index(terminal->terms, i);
+             t->index -= 1;
++            if ((GTK_IS_ACCEL_GROUP(t->parent->accel_group)) && (t->closure != NULL))
++                gtk_accel_group_disconnect(t->parent->accel_group, t->closure);
++            terminal_set_disable_alt(t, t->parent->setting->disable_alt);
+         }
+ 
+         /* Delete the tab and free the Term structure. */
+-- 
+1.6.3
\ No newline at end of file
diff --git a/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch b/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch
new file mode 100644
index 0000000..7580d9d
--- /dev/null
+++ b/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch
@@ -0,0 +1,20 @@
+diff --git a/src/lxterminal.c b/src/lxterminal.c
+index dc63796..a263150 100644
+--- a/src/lxterminal.c
++++ b/src/lxterminal.c
+@@ -1244,12 +1244,12 @@ LXTerminal * lxterminal_initialize(LXTermWindow * lxtermwin, CommandArguments *
+     /* Initialize accelerators. */
+     terminal_accelerator_initialize(terminal);
+ 
+-    /* Update terminal settings. */
+-    terminal_settings_apply(terminal);
+-
+     /* Show the widget, so it is realized and has a window. */
+     gtk_widget_show_all(terminal->window);
+ 
++    /* Update terminal settings. */
++    terminal_settings_apply(terminal);
++
+     /* Initialize the geometry hints. */
+     gdk_window_get_geometry_hints(GTK_WIDGET(term->vte)->window, &terminal->geometry, &terminal->geometry_mask);
+ 
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-0.1.9-fix-char_widthheight.patch b/lxterminal-0.1.9-fix-char_widthheight.patch
deleted file mode 100644
index 282d3ca..0000000
--- a/lxterminal-0.1.9-fix-char_widthheight.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 2cda6d2217f82cc993f4758ed44ef74c61f729ba Mon Sep 17 00:00:00 2001
-From: Andrea Florio <andrea@opensuse.org>
-Date: Thu, 2 Sep 2010 19:34:52 +0200
-Subject: [PATCH] fixed vte failure because of deprecated API
-
----
- configure.ac     |    2 +-
- src/lxterminal.c |   14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7458f21..bf0612e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -22,7 +22,7 @@ AC_ARG_ENABLE(man,
- # Checks for libraries.
- PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.6.0])
- PKG_CHECK_MODULES(gtk, [gtk+-2.0 >= 2.12.0])
--PKG_CHECK_MODULES(vte, [vte >= 0.17.1])
-+PKG_CHECK_MODULES(vte, [vte >= 0.20.0])
- CFLAGS="$CFLAGS $glib_CFLAGS $gtk_CFLAGS $vte_CFLAGS"
- LIBS="$LIBS $glib_LIBS $gtk_LIBS $vte_LIBS"
- 
-diff --git a/src/lxterminal.c b/src/lxterminal.c
-index dcae22a..da232b1 100644
---- a/src/lxterminal.c
-+++ b/src/lxterminal.c
-@@ -259,8 +259,8 @@ static void terminal_geometry_restore(Term * term)
-         vte_terminal_get_column_count(VTE_TERMINAL(term->vte)),
-         vte_terminal_get_row_count(VTE_TERMINAL(term->vte)));
-     gtk_window_resize(GTK_WINDOW(term->parent->window),
--        border->left + VTE_TERMINAL(term->vte)->char_width,
--        border->top + VTE_TERMINAL(term->vte)->char_height);
-+        border->left + vte_terminal_get_char_width(VTE_TERMINAL(term->vte)),  
-+        border->top + vte_terminal_get_char_height(VTE_TERMINAL(term->vte)));
-     gtk_border_free(border);
- }
- 
-@@ -632,8 +632,8 @@ static gboolean terminal_window_size_request_event(GtkWidget * widget, GtkRequis
-         Term * term = g_ptr_array_index(terminal->terms, 0);
-         GtkBorder * border = terminal_get_border(term);
-         GdkGeometry hints;
--        hints.width_inc = VTE_TERMINAL(term->vte)->char_width;
--        hints.height_inc = VTE_TERMINAL(term->vte)->char_height;
-+        hints.width_inc = vte_terminal_get_char_width(VTE_TERMINAL(term->vte));  
-+        hints.height_inc = vte_terminal_get_char_height(VTE_TERMINAL(term->vte));
-         hints.base_width = border->left;
-         hints.base_height = border->top;
-         hints.min_width = hints.base_width + hints.width_inc * 4;
-@@ -803,8 +803,8 @@ static gboolean terminal_vte_button_press_event(VteTerminal * vte, GdkEventButto
-         GtkBorder * border = terminal_get_border(term);
-         gint tag;
-         gchar * match = vte_terminal_match_check(vte,
--            (event->x - border->left) / vte->char_width,
--            (event->y - border->top) / vte->char_height,
-+            (event->x - border->left) / vte_terminal_get_char_width(vte),
-+            (event->y - border->top) / vte_terminal_get_char_height(vte),
-             &tag);
-         gtk_border_free(border);
- 
-@@ -929,7 +929,7 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
-     gtk_widget_show_all(term->tab);
- 
-     /* Set up scrollbar. */
--    gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), VTE_TERMINAL(term->vte)->adjustment);
-+    gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), vte_terminal_get_adjustment(VTE_TERMINAL(term->vte)));
- 
-     /* Fork the process that will have the VTE as its controlling terminal. */
-     if (exec != NULL)
--- 
-1.6.3
-
diff --git a/lxterminal-0.1.9.tar.bz2 b/lxterminal-0.1.9.tar.bz2
deleted file mode 100644
index 2edcce2..0000000
--- a/lxterminal-0.1.9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12d158019a4144361f87df6334bc7c48e4337db5f2f870e9d4ceafe2618faa53
-size 227802
diff --git a/lxterminal.changes b/lxterminal.changes
index 9e24143..5e0ac6c 100644
--- a/lxterminal.changes
+++ b/lxterminal.changes
@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Thu Sep  2 17:42:41 UTC 2010 - andrea@opensuse.org
-
-- added lxterminal-0.1.9-fix-char_widthheight.patch to fix
-  failure cause of vte deprecated API (thanks BManojlovic) 
-
--------------------------------------------------------------------
-Wed Sep 01 21:10:55 UTC 2010 - andrea@opensuse.org
-
-- new upstream version 0.1.9
-  - fixed mistake in preferences file write sf#3056693
-  - translations updates
-  - fix next/prev tab key shortcuts leave garbage characters
-    in window problem sf#3036190
-- removed patches that taken from upstream git code
-
 -------------------------------------------------------------------
 Thu Jul 29 08:30:55 UTC 2010 - andrea@opensuse.org
 
diff --git a/lxterminal.spec b/lxterminal.spec
index 7fbead6..9078d87 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package lxterminal (Version 0.1.9)
+# spec file for package lxterminal (Version 0.1.8)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 
 Name:           lxterminal
-Version:        0.1.9
+Version:        0.1.8
 Release:        2
 Summary:        Lightweight LXDE Terminal
 Group:          System/GUI/LXDE
@@ -29,9 +29,16 @@ Source0:        %name-%version.tar.bz2
 # 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-FEATURE-UPSTREAM lxterminal-0.1.9-fix-char_widthheight.patch andrea@opensuse.org
-# fixed failure because of vte deprecated API
-Patch1:		%name-0.1.9-fix-char_widthheight.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
+# PATCH-FIX-UPSTREAM lxterminal-0.1.8-hide_menu_bar-sf3032519.patch andrea@opensuse.org
+# upstream patch to fix sf#3032519 if toggle on hide menu bar in preference, then exit
+# and restart lxterminal, lxterminal will not hide menu bar, This patch fix this problem
+Patch2:         %name-0.1.8-hide_menu_bar-sf3032519.patch
+# PATCH-FIX-UPSTREAM lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch andrea@opensuse.org
+# upstream patch to fix sf#3036189 Fix Alt-key assignment after tab deleted
+Patch3:         %name-0.1.8-fix_alt-key_after_tab_delete.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
@@ -48,9 +55,12 @@ of the LXDE project
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
 %configure --enable-man
 %__make %{?jobs:-j%jobs}
 

From 07e56fd88c3b1e24b0ecb4eb95020c59b35f832b86338e8babf91346379648de Mon Sep 17 00:00:00 2001
From: Guido Berhoerster <gber@opensuse.org>
Date: Mon, 14 Mar 2011 18:57:42 +0000
Subject: [PATCH 18/18] - call %desktop_database_post/un

OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxterminal?expand=0&rev=50
---
 ...rminal-0.1.8-fix-alt_n-sf3006779.patch.bz2 |  3 -
 ...l-0.1.8-fix_alt-key_after_tab_delete.patch | 25 -------
 ...rminal-0.1.8-hide_menu_bar-sf3032519.patch | 20 ------
 lxterminal-0.1.8.tar.bz2                      |  3 -
 lxterminal-0.1.9-fix-char_widthheight.patch   | 72 +++++++++++++++++++
 lxterminal-0.1.9.tar.bz2                      |  3 +
 lxterminal.changes                            | 21 ++++++
 lxterminal.spec                               | 30 ++++----
 8 files changed, 110 insertions(+), 67 deletions(-)
 delete mode 100644 lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2
 delete mode 100644 lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch
 delete mode 100644 lxterminal-0.1.8-hide_menu_bar-sf3032519.patch
 delete mode 100644 lxterminal-0.1.8.tar.bz2
 create mode 100644 lxterminal-0.1.9-fix-char_widthheight.patch
 create mode 100644 lxterminal-0.1.9.tar.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
deleted file mode 100644
index c8389f3..0000000
--- a/lxterminal-0.1.8-fix-alt_n-sf3006779.patch.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12ab9db3af00dea0a56b65702eda672f9e5ea60c54c4beed501c967c3f84d8a1
-size 34507
diff --git a/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch b/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch
deleted file mode 100644
index e2f63be..0000000
--- a/lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 86fbd89e295dfd7dfdc3a4ac838e3aca524dd02c Mon Sep 17 00:00:00 2001
-From: Marty Jack <martyj@linux.local>
-Date: Wed, 28 Jul 2010 17:30:47 -0400
-Subject: [PATCH] Fix Alt-key assignment after tab deleted (Bug3036189; Patch3036253, Ideal Shang)
-
----
- src/lxterminal.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/lxterminal.c b/src/lxterminal.c
-index a263150..9f89bb4 100644
---- a/src/lxterminal.c
-+++ b/src/lxterminal.c
-@@ -737,6 +737,9 @@ static void terminal_child_exited_event(VteTerminal * vte, Term * term)
-         {
-             Term * t = g_ptr_array_index(terminal->terms, i);
-             t->index -= 1;
-+            if ((GTK_IS_ACCEL_GROUP(t->parent->accel_group)) && (t->closure != NULL))
-+                gtk_accel_group_disconnect(t->parent->accel_group, t->closure);
-+            terminal_set_disable_alt(t, t->parent->setting->disable_alt);
-         }
- 
-         /* Delete the tab and free the Term structure. */
--- 
-1.6.3
\ No newline at end of file
diff --git a/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch b/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch
deleted file mode 100644
index 7580d9d..0000000
--- a/lxterminal-0.1.8-hide_menu_bar-sf3032519.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/lxterminal.c b/src/lxterminal.c
-index dc63796..a263150 100644
---- a/src/lxterminal.c
-+++ b/src/lxterminal.c
-@@ -1244,12 +1244,12 @@ LXTerminal * lxterminal_initialize(LXTermWindow * lxtermwin, CommandArguments *
-     /* Initialize accelerators. */
-     terminal_accelerator_initialize(terminal);
- 
--    /* Update terminal settings. */
--    terminal_settings_apply(terminal);
--
-     /* Show the widget, so it is realized and has a window. */
-     gtk_widget_show_all(terminal->window);
- 
-+    /* Update terminal settings. */
-+    terminal_settings_apply(terminal);
-+
-     /* Initialize the geometry hints. */
-     gdk_window_get_geometry_hints(GTK_WIDGET(term->vte)->window, &terminal->geometry, &terminal->geometry_mask);
- 
diff --git a/lxterminal-0.1.8.tar.bz2 b/lxterminal-0.1.8.tar.bz2
deleted file mode 100644
index 1001966..0000000
--- a/lxterminal-0.1.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86c87bcd275f5d6d59f6e1be3781e26e943693097fa3df694effe596ba7cb901
-size 226335
diff --git a/lxterminal-0.1.9-fix-char_widthheight.patch b/lxterminal-0.1.9-fix-char_widthheight.patch
new file mode 100644
index 0000000..282d3ca
--- /dev/null
+++ b/lxterminal-0.1.9-fix-char_widthheight.patch
@@ -0,0 +1,72 @@
+From 2cda6d2217f82cc993f4758ed44ef74c61f729ba Mon Sep 17 00:00:00 2001
+From: Andrea Florio <andrea@opensuse.org>
+Date: Thu, 2 Sep 2010 19:34:52 +0200
+Subject: [PATCH] fixed vte failure because of deprecated API
+
+---
+ configure.ac     |    2 +-
+ src/lxterminal.c |   14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7458f21..bf0612e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,7 @@ AC_ARG_ENABLE(man,
+ # Checks for libraries.
+ PKG_CHECK_MODULES(glib, [glib-2.0 >= 2.6.0])
+ PKG_CHECK_MODULES(gtk, [gtk+-2.0 >= 2.12.0])
+-PKG_CHECK_MODULES(vte, [vte >= 0.17.1])
++PKG_CHECK_MODULES(vte, [vte >= 0.20.0])
+ CFLAGS="$CFLAGS $glib_CFLAGS $gtk_CFLAGS $vte_CFLAGS"
+ LIBS="$LIBS $glib_LIBS $gtk_LIBS $vte_LIBS"
+ 
+diff --git a/src/lxterminal.c b/src/lxterminal.c
+index dcae22a..da232b1 100644
+--- a/src/lxterminal.c
++++ b/src/lxterminal.c
+@@ -259,8 +259,8 @@ static void terminal_geometry_restore(Term * term)
+         vte_terminal_get_column_count(VTE_TERMINAL(term->vte)),
+         vte_terminal_get_row_count(VTE_TERMINAL(term->vte)));
+     gtk_window_resize(GTK_WINDOW(term->parent->window),
+-        border->left + VTE_TERMINAL(term->vte)->char_width,
+-        border->top + VTE_TERMINAL(term->vte)->char_height);
++        border->left + vte_terminal_get_char_width(VTE_TERMINAL(term->vte)),  
++        border->top + vte_terminal_get_char_height(VTE_TERMINAL(term->vte)));
+     gtk_border_free(border);
+ }
+ 
+@@ -632,8 +632,8 @@ static gboolean terminal_window_size_request_event(GtkWidget * widget, GtkRequis
+         Term * term = g_ptr_array_index(terminal->terms, 0);
+         GtkBorder * border = terminal_get_border(term);
+         GdkGeometry hints;
+-        hints.width_inc = VTE_TERMINAL(term->vte)->char_width;
+-        hints.height_inc = VTE_TERMINAL(term->vte)->char_height;
++        hints.width_inc = vte_terminal_get_char_width(VTE_TERMINAL(term->vte));  
++        hints.height_inc = vte_terminal_get_char_height(VTE_TERMINAL(term->vte));
+         hints.base_width = border->left;
+         hints.base_height = border->top;
+         hints.min_width = hints.base_width + hints.width_inc * 4;
+@@ -803,8 +803,8 @@ static gboolean terminal_vte_button_press_event(VteTerminal * vte, GdkEventButto
+         GtkBorder * border = terminal_get_border(term);
+         gint tag;
+         gchar * match = vte_terminal_match_check(vte,
+-            (event->x - border->left) / vte->char_width,
+-            (event->y - border->top) / vte->char_height,
++            (event->x - border->left) / vte_terminal_get_char_width(vte),
++            (event->y - border->top) / vte_terminal_get_char_height(vte),
+             &tag);
+         gtk_border_free(border);
+ 
+@@ -929,7 +929,7 @@ static Term * terminal_new(LXTerminal * terminal, const gchar * label, const gch
+     gtk_widget_show_all(term->tab);
+ 
+     /* Set up scrollbar. */
+-    gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), VTE_TERMINAL(term->vte)->adjustment);
++    gtk_range_set_adjustment(GTK_RANGE(term->scrollbar), vte_terminal_get_adjustment(VTE_TERMINAL(term->vte)));
+ 
+     /* Fork the process that will have the VTE as its controlling terminal. */
+     if (exec != NULL)
+-- 
+1.6.3
+
diff --git a/lxterminal-0.1.9.tar.bz2 b/lxterminal-0.1.9.tar.bz2
new file mode 100644
index 0000000..2edcce2
--- /dev/null
+++ b/lxterminal-0.1.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12d158019a4144361f87df6334bc7c48e4337db5f2f870e9d4ceafe2618faa53
+size 227802
diff --git a/lxterminal.changes b/lxterminal.changes
index 5e0ac6c..26d34fa 100644
--- a/lxterminal.changes
+++ b/lxterminal.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Mar 14 18:51:11 UTC 2011 - gber@opensuse.org
+
+- call %desktop_database_post/un
+
+-------------------------------------------------------------------
+Thu Sep  2 17:42:41 UTC 2010 - andrea@opensuse.org
+
+- added lxterminal-0.1.9-fix-char_widthheight.patch to fix
+  failure cause of vte deprecated API (thanks BManojlovic) 
+
+-------------------------------------------------------------------
+Wed Sep 01 21:10:55 UTC 2010 - andrea@opensuse.org
+
+- new upstream version 0.1.9
+  - fixed mistake in preferences file write sf#3056693
+  - translations updates
+  - fix next/prev tab key shortcuts leave garbage characters
+    in window problem sf#3036190
+- removed patches that taken from upstream git code
+
 -------------------------------------------------------------------
 Thu Jul 29 08:30:55 UTC 2010 - andrea@opensuse.org
 
diff --git a/lxterminal.spec b/lxterminal.spec
index 9078d87..1fd2396 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package lxterminal (Version 0.1.8)
+# spec file for package lxterminal (Version 0.1.9)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,8 +19,8 @@
 
 
 Name:           lxterminal
-Version:        0.1.8
-Release:        2
+Version:        0.1.9
+Release:        1
 Summary:        Lightweight LXDE Terminal
 Group:          System/GUI/LXDE
 License:        GPL
@@ -29,16 +29,9 @@ Source0:        %name-%version.tar.bz2
 # 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 (enable/disable Alt+n)
-Patch1:         %name-0.1.8-fix-alt_n-sf3006779.patch.bz2
-# PATCH-FIX-UPSTREAM lxterminal-0.1.8-hide_menu_bar-sf3032519.patch andrea@opensuse.org
-# upstream patch to fix sf#3032519 if toggle on hide menu bar in preference, then exit
-# and restart lxterminal, lxterminal will not hide menu bar, This patch fix this problem
-Patch2:         %name-0.1.8-hide_menu_bar-sf3032519.patch
-# PATCH-FIX-UPSTREAM lxterminal-0.1.8-fix_alt-key_after_tab_delete.patch andrea@opensuse.org
-# upstream patch to fix sf#3036189 Fix Alt-key assignment after tab deleted
-Patch3:         %name-0.1.8-fix_alt-key_after_tab_delete.patch
+# PATCH-FEATURE-UPSTREAM lxterminal-0.1.9-fix-char_widthheight.patch andrea@opensuse.org
+# fixed failure because of vte deprecated API
+Patch1:         %name-0.1.9-fix-char_widthheight.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
@@ -55,12 +48,9 @@ of the LXDE project
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
 %configure --enable-man
 %__make %{?jobs:-j%jobs}
 
@@ -75,6 +65,14 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
+%if 0%{?suse_version} >= 1140
+%post
+%desktop_database_post
+
+%postun
+%desktop_database_postun
+%endif
+
 %files
 %defattr(-,root,root,0755)
 %doc COPYING