$ git show --format=fuller --patch-with-stat --summary 9a7561275fe8c9d2b67c36565235e784b193d13a
commit 9a7561275fe8c9d2b67c36565235e784b193d13a
Author: mandian <mandian@users.noreply.github.com>
AuthorDate: Wed Dec 6 17:45:37 2023 +0000
Commit: mandian <mandian@users.noreply.github.com>
CommitDate: Wed Dec 6 17:45:37 2023 +0000
upgrade at the latest git version and rebuild against gtk3
---
.abf.yml | 1 +
...onf.patch => lxterminal-openmandriva_conf.patch | 4 +-
lxterminal.spec | 45 ++++++++++++++--------
3 files changed, 32 insertions(+), 18 deletions(-)
rename mdk-lxterminal-conf.patch => lxterminal-openmandriva_conf.patch (73%)
diff --git a/.abf.yml b/.abf.yml
index 5a9553b..712ef10 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,3 @@
sources:
lxterminal-0.4.0.tar.xz: 9f065280fae8b6ca0439699ce73dd661a4f21d43
+ lxterminal-9b4299c292567b371158368686088900a4c0a128.tar.gz: 207ff512b69426ce716b6db1974d367bdab819aa
diff --git a/mdk-lxterminal-conf.patch b/lxterminal-openmandriva_conf.patch
similarity index 73%
rename from mdk-lxterminal-conf.patch
rename to lxterminal-openmandriva_conf.patch
index c954c79..dfeba5a 100644
--- a/mdk-lxterminal-conf.patch
+++ b/lxterminal-openmandriva_conf.patch
@@ -1,5 +1,5 @@
---- data/lxterminal.conf.in.old 2011-06-12 19:17:18.000000000 +0400
-+++ data/lxterminal.conf.in 2011-06-13 15:34:06.000000000 +0400
+--- a/data/lxterminal.conf.in
++++ b/data/lxterminal.conf.in
@@ -1,4 +1,17 @@
[general]
-fontname=Monospace 10
diff --git a/lxterminal.spec b/lxterminal.spec
index 21f7ee2..4a873be 100644
--- a/lxterminal.spec
+++ b/lxterminal.spec
@@ -1,22 +1,40 @@
+# git snapshot
+%global snapshot 1
+%if 0%{?snapshot}
+ %global commit 9b4299c292567b371158368686088900a4c0a128
+ %global commitdate 20230923
+ %global shortcommit %(c=%{commit}; echo ${c:0:7})
+%endif
+
Summary: Lightweight VTE-based terminal emulator
Name: lxterminal
Version: 0.4.0
-Release: 1
+Release: 2
License: GPLv2+
Group: Graphical desktop/Other
Url: http://lxde.sourceforge.net/
-Source0: https://sourceforge.net/projects/lxde/files/LXTerminal%20%28terminal%20emulator%29/LXTerminal%20%{version}/%{name}-%{version}.tar.xz
-Patch2: mdk-lxterminal-conf.patch
+#Source0: https://sourceforge.net/projects/lxde/files/LXTerminal%20%28terminal%20emulator%29/LXTerminal%20%{version}/%{name}-%{version}.tar.xz
+Source0: https://github.com/lxde/lxterminal/archive/%{?snapshot:%{commit}}%{!?snapshot:%{version}}/%{name}-%{?snapshot:%{commit}}%{!?snapshot:%{version}}.tar.gz
+Patch100: lxterminal-openmandriva_conf.patch
BuildRequires: intltool
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(gtk+-3.0)
+#BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(vte-2.91)
-BuildRequires: pkgconfig(libpcre2-32)
+BuildRequires: pkgconfig(libpcre2-32)
BuildRequires: docbook-to-man
BuildRequires: docbook-style-xsl
BuildRequires: xsltproc
Requires: termcap
+%files -f %{name}.lang
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/*.desktop
+%{_iconsdir}/hicolor/*/apps/%{name}.png
+%{_mandir}/man1/*
+
+#---------------------------------------------------------------------------
+
%description
Desktop-independent VTE-based terminal emulator without any unnecessary
dependencies.
@@ -31,22 +49,17 @@ Feature:
the same process.
%prep
-%setup -qn %{name}-%{version}
-%patch2 -p0 -b.conf
+%autosetup -p1 -n %{name}-%{?snapshot:%{commit}}%{!?snapshot:%{version}}
%build
-%configure -enable-gtk3
+autoreconf -fiv
+%configure \
+ -enable-gtk3
%make_build
%install
%make_install
+# locales
%find_lang %{name}
-%files -f %{name}.lang
-%{_bindir}/%{name}
-%{_datadir}/%{name}
-%{_datadir}/applications/*.desktop
-%{_iconsdir}/hicolor/*x*/apps/lxterminal.png
-%{_mandir}/man1/*
-