[packages/amtterm] - updated to 1.7; gtk+3 now, SOL_CONTROLS_FROM_HOST (0x29) is now handled upstream

[qboosh]

commit 12a909380bb7a901df3bd12f65890be46062759c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Feb 18 21:59:19 2025 +0100

    - updated to 1.7; gtk+3 now, SOL_CONTROLS_FROM_HOST (0x29) is now handled upstream

 amtterm-reconnect-hack.patch | 18 ------------------
 amtterm.spec                 | 31 ++++++++++++++++++++++---------
 2 files changed, 22 insertions(+), 27 deletions(-)
---
diff --git a/amtterm.spec b/amtterm.spec
index 6c0a5ce..ee24a55 100644
--- a/amtterm.spec
+++ b/amtterm.spec
@@ -1,19 +1,29 @@
+#
+# Conditional build:
+%bcond_with	gnutls	# GnuTLS instead of OpenSSL for encryption
+%bcond_without	openssl	# OpenSSL encryption support
+
+%if %{with gnutls}
+%undefine	with_openssl
+%endif
 Summary:	Intel AMT serial-over-lan (sol) client
 Summary(pl.UTF-8):	Klient portu szeregowego po sieci (SOL) Intel AMT
 Name:		amtterm
-Version:	1.3
-Release:	2
+Version:	1.7
+Release:	1
 License:	GPL v2
 Group:		Applications/Networking
-Source0:	http://www.kraxel.org/releases/amtterm/%{name}-%{version}.tar.gz
-# Source0-md5:	a2385b2305680ae06687867527924ff5
-Patch0:		amtterm-reconnect-hack.patch
-URL:		http://www.kraxel.org/blog/linux/amtterm/
-BuildRequires:	gtk+2-devel >= 2.0
+Source0:	https://www.kraxel.org/releases/amtterm/%{name}-%{version}.tar.gz
+# Source0-md5:	c8ab796464e11df115d82d39f30f28b1
+URL:		https://www.kraxel.org/blog/linux/amtterm/
+%{?with_gnutls:BuildRequires:	gnutls-devel}
+BuildRequires:	gtk+3-devel >= 3.0
+%{?with_openssl:BuildRequires:	openssl-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	rpm-perlprov >= 4.1-13
-BuildRequires:	vte0-devel
+BuildRequires:	vte-devel >= 0.38
+# for amttool
 Requires:	perl-SOAP-Lite
 Requires:	perl-SOAP-Lite-HTTP
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,7 +51,6 @@ Ten pakiet zawiera wersję graficzną (GTK+).
 
 %prep
 %setup -q
-%patch -P0 -p1
 
 %build
 # note: force LIB= because check is error-prone, e.g. existence of
@@ -54,6 +63,8 @@ LDFLAGS="%{rpmldflags}" \
 STRIP=" " \
 %{__make} \
 	LIB=%{_lib} \
+	%{?with_gnutls:USE_GNUTLS=1} \
+	%{?with_openssl:USE_OPENSSL=1} \
 	verbose=yes
 
 %install
@@ -68,8 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/amtider
 %attr(755,root,root) %{_bindir}/amtterm
 %attr(755,root,root) %{_bindir}/amttool
+%{_mandir}/man1/amtider.1*
 %{_mandir}/man1/amtterm.1*
 %{_mandir}/man1/amttool.1*
 %{_mandir}/man7/amt-howto.7*
diff --git a/amtterm-reconnect-hack.patch b/amtterm-reconnect-hack.patch
deleted file mode 100644
index da103d6..0000000
--- a/amtterm-reconnect-hack.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur amtterm-1.3/redir.c amtterm-1.3.ne/redir.c
---- amtterm-1.3/redir.c	2011-05-26 11:19:45.000000000 +0200
-+++ amtterm-1.3.ne/redir.c	2012-04-17 11:40:56.000000000 +0200
-@@ -382,6 +382,14 @@
- 		goto again;
- 	    redir_stop(r);
- 	    break;
-+	case 0x29: /* FIXME */
-+	    bshift = r->blen;
-+	    if (r->blen < bshift)
-+		goto again;
-+	    redir_stop(r);
-+	    redir_connect(r);
-+	    redir_start(r);
-+	    break;
- 	default:
- 	    snprintf(r->err, sizeof(r->err), "%s: unknown r->buf 0x%02x",
- 		     __FUNCTION__, r->buf[0]);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/amtterm.git/commitdiff/12a909380bb7a901df3bd12f65890be46062759c