[packages/lxterminal] up to 0.2.0

[glen]

commit 53e36d68469de464d430730ad9d4fd02fc18eab9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jul 27 13:39:45 2015 +0300

    up to 0.2.0
    
    - Now builds under GTK3
    - Revamp of Preferences, including ability to change keyboard accels.
    - Option to hide mouse cursor on input
    - Fixed issue with 'ctrl-shift-c' accel sending 'ctrl-c' to terminal.
    - Fixed handling of multi-file input on -e/--command (eg -e foo *.txt)
    - Fixed issue where initial geometry is affected by hidden/shown UI elements.
    - File->Quit now replaced by safer "File->Close Window"

 lxterminal.spec | 32 +++++++++++++++++++++-----------
 wordseps.patch  | 16 ++++++++--------
 2 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/lxterminal.spec b/lxterminal.spec
index 2574cdd..e5b7a6e 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -9,26 +9,28 @@
 
 Summary:	LXTerminal is the standard terminal emulator of LXDE
 Name:		lxterminal
-Version:	0.1.11
-Release:	6
+Version:	0.2.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
-# Source0-md5:	fd9140b45c0f28d021253c4aeb8c4aea
+# Source0-md5:	e80ad1b6e26212f3d43908c2ad87ba4d
 Patch0:		wordseps.patch
 URL:		http://wiki.lxde.org/en/LXTerminal
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	gettext-tools
-BuildRequires:	gtk+2-devel
-%{?with_gtk2:BuildRequires:	gtk+2-devel}
-%{?with_gtk3:BuildRequires:	gtk+3-devel}
+%{?with_gtk2:BuildRequires:	gtk+2-devel >= 1:2.18.0}
+%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
 BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	perl-XML-Parser
 BuildRequires:	pkgconfig
 %{?with_gtk3:BuildRequires:	vte-devel}
 %{?with_gtk2:BuildRequires:	vte0-devel}
+Requires:	desktop-file-utils
+Requires:	gtk-update-icon-cache
+Requires:	hicolor-icon-theme
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,15 +39,15 @@ LXTerminal is the standard terminal emulator of LXDE.
 %prep
 %setup -q
 %patch0 -p1
-
 %{__sed} -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac
 
 %build
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
-%{__intltoolize}
+%{__automake}
 %configure \
 	--disable-silent-rules \
 	%{?with_gtk3:--enable-gtk3}
@@ -68,11 +70,19 @@ mv $RPM_BUILD_ROOT%{_localedir}/tt{_RU,}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_desktop_database
+%update_icon_cache hicolor
+
+%postun
+%update_desktop_database
+%update_icon_cache hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/%{name}
+%{_mandir}/man1/lxterminal.1*
 %{_desktopdir}/%{name}.desktop
-%{_mandir}/man1/%{name}*
-%{_pixmapsdir}/%{name}.png
 %{_datadir}/%{name}
+%{_iconsdir}/hicolor/*/apps/lxterminal.png
diff --git a/wordseps.patch b/wordseps.patch
index ac880cd..efbf8b4 100644
--- a/wordseps.patch
+++ b/wordseps.patch
@@ -4,14 +4,14 @@ similar patches:
 - Gnome-terminal: http://git.pld-linux.org/?p=packages/gnome-terminal.git;a=blob;f=wordseps.patch
 - mate-terminal: http://git.pld-linux.org/?p=packages/mate-terminal.git;a=blob;f=wordseps.patch
 
---- lxterminal-0.1.11/src/setting.c~	2012-04-21 22:50:34.000000000 +0300
-+++ lxterminal-0.1.11/src/setting.c	2012-04-21 22:50:36.003908733 +0300
-@@ -123,7 +123,7 @@
-     if (setting->tab_position == NULL)
-         setting->tab_position = g_strdup("top");
+--- lxterminal-0.2.0/src/setting.c~	2014-10-21 18:29:18.000000000 +0300
++++ lxterminal-0.2.0/src/setting.c	2015-07-27 13:37:23.327432384 +0300
+@@ -307,7 +307,7 @@
+     }
      if (setting->word_selection_characters == NULL)
+     {
 -        setting->word_selection_characters = g_strdup("-A-Za-z0-9,./?%&#:_~");
 +        setting->word_selection_characters = g_strdup("-A-Za-z0-9,./?%&#:_~=+;@");
-     if (setting->background_alpha == NULL)
-         setting->background_alpha = 65535;
-     return setting;
+     }
+     
+     /* Default configuration for shortcut group settings. */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxterminal.git/commitdiff/53e36d68469de464d430730ad9d4fd02fc18eab9