[packages/hamlib] - updated to 4.5.5 (new sonames, introduces INDI support; texinfo docs gone)

Sun Apr 9 20:40:46 CEST 2023

commit 3e44ec7a8cbe10a123d3e5bbd80229ab4454d5e9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 9 20:43:21 2023 +0200

    - updated to 4.5.5 (new sonames, introduces INDI support; texinfo docs gone)

 hamlib-format.patch | 11 ---------
 hamlib-info.patch   | 14 ------------
 hamlib-usrp.patch   |  4 ++--
 hamlib.spec         | 64 ++++++++++++++++++++++++++++++-----------------------
 4 files changed, 38 insertions(+), 55 deletions(-)
---

diff --git a/hamlib.spec b/hamlib.spec
index d8ca01d..abfb617 100644
--- a/hamlib.spec
+++ b/hamlib.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# static library
+%bcond_without	indi		# INDI rigctl/rotctl support
 %bcond_without	usrp		# USRP backend
 %bcond_without	lua		# Lua binding
 %bcond_without	perl		# Perl binding
@@ -10,25 +11,25 @@
 Summary:	Library to control radio transceivers and receivers
 Summary(pl.UTF-8):	Biblioteka do sterowania nadajnikami i odbiornikami radiowymi
 Name:		hamlib
-Version:	3.3
-Release:	7
+Version:	4.5.5
+Release:	1
 License:	LGPL v2.1+ (library), GPL v2+ (programs)
 Group:		Libraries
 #Source0Download: https://github.com/Hamlib/Hamlib/releases
 Source0:	https://github.com/Hamlib/Hamlib/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	2faa2894a61ed0ef307740aa6e3b73e4
+# Source0-md5:	9996f507ae570be50d09df1157f140e0
 Patch0:		%{name}-perl_install.patch
-Patch1:		%{name}-format.patch
-Patch2:		%{name}-info.patch
-Patch3:		%{name}-usrp.patch
+Patch1:		%{name}-usrp.patch
 URL:		http://hamlib.org/
-BuildRequires:	autoconf >= 2.67
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
 BuildRequires:	boost-devel
 BuildRequires:	doxygen
 BuildRequires:	gd-devel
+%{?with_indi:BuildRequires:	libindi-devel}
 BuildRequires:	libltdl-devel >= 2:2.2.6b
-BuildRequires:	libstdc++-devel
+%{?with_indi:BuildRequires:	libnova-devel}
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libtool >= 2:2.2.6b
 %{?with_usrp:BuildRequires:	libusrp-devel >= 0.8}
 BuildRequires:	libusb-devel >= 1.0
@@ -42,9 +43,10 @@ BuildRequires:	readline-devel
 %{?with_python:BuildRequires:	swig-python >= 1.3.22}
 %{?with_tcl:BuildRequires:	swig-tcl >= 1.3.22}
 %{?with_tcl:BuildRequires:	tcl-devel}
-BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		tcl_libdir	%{_libdir}/tcl%{tcl_version}
+
 %description
 Hamlib provides a standardized programming interface that applications
 can use to send the appropriate commands to a radio.
@@ -127,7 +129,7 @@ License:	LGPL v2.1+
 Group:		Development/Libraries
 Requires:	%{name}-c++ = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
-Requires:	libstdc++-devel
+Requires:	libstdc++-devel >= 6:4.7
 
 %description c++-devel
 Development headers for building C++ applications with Hamlib radio
@@ -210,8 +212,6 @@ radiem z poziomu skryptów Tcl-a.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -221,9 +221,11 @@ radiem z poziomu skryptów Tcl-a.
 %{__automake}
 %configure \
 	LUA=/usr/bin/lua5.2 \
+	TCL_VERSION=%{tcl_version} \
 	--disable-silent-rules \
 	%{!?with_static_libs:--disable-static} \
 	%{?with_usrp:--enable-usrp} \
+	%{!?with_indi:--without-indi} \
 	%{?with_lua:--with-lua-binding} \
 	%{?with_perl:--with-perl-binding} \
 	%{?with_python:--with-python-binding} \
@@ -242,8 +244,6 @@ rm -rf $RPM_BUILD_ROOT
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libhamlib*.la
 
-%{__rm} -f $RPM_BUILD_ROOT%{_infodir}/dir
-
 %if %{with lua}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lua/5.*/Hamliblua.la \
 	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/lua/5.*/Hamliblua.a}
@@ -265,33 +265,38 @@ rm -rf $RPM_BUILD_ROOT
 	%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/tcl*/Hamlib/hamlibtcl.a}
 %endif
 
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/hamlib
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/postshell
-/sbin/ldconfig
--/usr/sbin/fix-info-dir -c %{_infodir}
-
-%postun	-p /sbin/postshell
-/sbin/ldconfig
--/usr/sbin/fix-info-dir -c %{_infodir}
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %post	c++ -p /sbin/ldconfig
 %postun	c++ -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog LICENSE NEWS PLAN README THANKS TODO
+%doc AUTHORS ChangeLog LICENSE NEWS PLAN README README.freqranges README.multicast THANKS
+%attr(755,root,root) %{_bindir}/ampctl
+%attr(755,root,root) %{_bindir}/ampctld
 %attr(755,root,root) %{_bindir}/rigctl
+%attr(755,root,root) %{_bindir}/rigctlcom
 %attr(755,root,root) %{_bindir}/rigctld
 %attr(755,root,root) %{_bindir}/rigmem
 %attr(755,root,root) %{_bindir}/rigsmtr
 %attr(755,root,root) %{_bindir}/rigswr
+%attr(755,root,root) %{_bindir}/rigtestlibusb
 %attr(755,root,root) %{_bindir}/rotctl
 %attr(755,root,root) %{_bindir}/rotctld
 %attr(755,root,root) %{_libdir}/libhamlib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhamlib.so.2
+%attr(755,root,root) %ghost %{_libdir}/libhamlib.so.4
+%{_mandir}/man1/ampctl.1*
+%{_mandir}/man1/ampctld.1*
 %{_mandir}/man1/rigctl.1*
+%{_mandir}/man1/rigctlcom.1*
 %{_mandir}/man1/rigctld.1*
 %{_mandir}/man1/rigmem.1*
 %{_mandir}/man1/rigsmtr.1*
@@ -301,12 +306,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/hamlib.7*
 %{_mandir}/man7/hamlib-primer.7*
 %{_mandir}/man7/hamlib-utilities.7*
-%{_infodir}/hamlib.info*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libhamlib.so
 %dir %{_includedir}/hamlib
+%{_includedir}/hamlib/ampclass.h
+%{_includedir}/hamlib/amplifier.h
+%{_includedir}/hamlib/amplist.h
+%{_includedir}/hamlib/config.h
 %{_includedir}/hamlib/rig.h
 %{_includedir}/hamlib/rig_dll.h
 %{_includedir}/hamlib/riglist.h
@@ -328,7 +336,7 @@ rm -rf $RPM_BUILD_ROOT
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libhamlib++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhamlib++.so.2
+%attr(755,root,root) %ghost %{_libdir}/libhamlib++.so.4
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -366,7 +374,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with tcl}
 %files -n tcl-%{name}
 %defattr(644,root,root,755)
-%dir %{_libdir}/tcl8.6/Hamlib
-%attr(755,root,root) %{_libdir}/tcl8.6/Hamlib/hamlibtcl*.so
-%{_libdir}/tcl8.6/Hamlib/pkgIndex.tcl
+%dir %{tcl_libdir}/Hamlib
+%attr(755,root,root) %{tcl_libdir}/Hamlib/hamlibtcl*.so
+%{tcl_libdir}/Hamlib/pkgIndex.tcl
 %endif
diff --git a/hamlib-format.patch b/hamlib-format.patch
deleted file mode 100644
index e93375f..0000000
--- a/hamlib-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hamlib-3.3/tests/rotctl_parse.c.orig	2018-08-20 17:30:25.000000000 +0200
-+++ hamlib-3.3/tests/rotctl_parse.c	2019-05-08 16:03:25.046301429 +0200
-@@ -1009,7 +1009,7 @@
-             /* The starting position of the source string is the first
-              * character past the initial '\'.
-              */
--            snprintf(cmd_name, sizeof(cmd_name), parsed_input[0] + 1);
-+            snprintf(cmd_name, sizeof(cmd_name), "%s", parsed_input[0] + 1);
- 
-             /* Sanity check as valid multiple character commands consist of
-              * alpha-numeric characters and the underscore ('_') character.
diff --git a/hamlib-info.patch b/hamlib-info.patch
deleted file mode 100644
index c75994c..0000000
--- a/hamlib-info.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- hamlib-3.3/doc/hamlib.texi.orig	2018-08-20 17:30:25.000000000 +0200
-+++ hamlib-3.3/doc/hamlib.texi	2019-05-08 17:51:34.114480464 +0200
-@@ -24,9 +24,9 @@
- @end quotation
- @end copying
- 
-- at dircategory Software libraries
-+ at dircategory Libraries:
- @direntry
--* Hamlib: (hamlib).             Ham Radio Control Libraries.
-+* Hamlib: (hamlib).			Ham Radio Control Libraries
- @end direntry
- 
- @setchapternewpage odd
diff --git a/hamlib-usrp.patch b/hamlib-usrp.patch
index 384f55b..56dbfea 100644
--- a/hamlib-usrp.patch
+++ b/hamlib-usrp.patch
@@ -1,5 +1,5 @@
---- hamlib-3.3/kit/usrp_impl.cc.orig	2018-08-20 17:30:25.000000000 +0200
-+++ hamlib-3.3/kit/usrp_impl.cc	2019-05-13 05:31:23.318062894 +0200
+--- hamlib-4.5.5/rigs/kit/usrp_impl.cc.orig	2018-08-20 17:30:25.000000000 +0200
++++ hamlib-4.5.5/rigs/kit/usrp_impl.cc	2019-05-13 05:31:23.318062894 +0200
 @@ -32,7 +32,7 @@
  #include <stdlib.h>
  #include <stdio.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hamlib.git/commitdiff/3e44ec7a8cbe10a123d3e5bbd80229ab4454d5e9

