Accepting request 43462 from X11:lxde

Copy from X11:lxde/lxterminal based on submit request 43462 from user anubisg1

OBS-URL: https://build.opensuse.org/request/show/43462
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxterminal?expand=0&rev=9

lxterminal-0.1.6-disable-f10.patch

@@ -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

lxterminal-0.1.7-fix-path.patch

@@ -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);

lxterminal-0.1.7.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98c03a9d29189745a3a8fda171b5f103f6ec275353f4e14849b8bc8b844c5aab
-size 213293

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

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

lxterminal-0.1.8.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86c87bcd275f5d6d59f6e1be3781e26e943693097fa3df694effe596ba7cb901
+size 226335

lxterminal.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+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
+
+- 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
 

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,24 +19,31 @@
 
 
 Name:           lxterminal
-Version:        0.1.7
+Version:        0.1.8
-Release:        4
+Release:        1
 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
+# PATCH-FEATURE-OPENSUSE lxterminal-0.1.8-disable-f10.patch andrea@opensuse.org
-Patch1:         %name-0.1.7-fix-path.patch
+# 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
 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
@@ -59,14 +66,17 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%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