From 9eba610e7b57f25cddbd9382b027de441f1ed9ac Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 1/7] Eliminate use of obsolete %patchN syntax (#2283636) --- iaxclient.spec | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/iaxclient.spec b/iaxclient.spec index a3f59be..7f7e0ff 100644 --- a/iaxclient.spec +++ b/iaxclient.spec @@ -119,21 +119,21 @@ wx IAX Phone Client. %prep %setup -q -n %{name}-%{mainver}%{betaver} -%patch0 -p1 -b .wxGTK28 -%patch1 -p1 -b .tkphone -%patch2 -p1 -b .includedir -%patch3 -p1 -b .libdir -%patch4 -p1 -b .nodoc -%patch5 -p1 -b .theoradetect -%patch6 -p1 -b .DSO -%patch7 -p1 -b .arm -%patch8 -p1 -b .portable -%patch9 -p1 -b .linkiax -%patch10 -p1 -b .ilbc -%patch11 -p1 -b .fpic -%patch12 -p1 -b .wx3 -%patch13 -p1 -b .gtk3 -%patch14 -p1 -b .gcc14 +%patch -P0 -p1 -b .wxGTK28 +%patch -P1 -p1 -b .tkphone +%patch -P2 -p1 -b .includedir +%patch -P3 -p1 -b .libdir +%patch -P4 -p1 -b .nodoc +%patch -P5 -p1 -b .theoradetect +%patch -P6 -p1 -b .DSO +%patch -P7 -p1 -b .arm +%patch -P8 -p1 -b .portable +%patch -P9 -p1 -b .linkiax +%patch -P10 -p1 -b .ilbc +%patch -P11 -p1 -b .fpic +%patch -P12 -p1 -b .wx3 +%patch -P13 -p1 -b .gtk3 +%patch -P14 -p1 -b .gcc14 # Delete bundled libraries (except libiax2) just to be sure rm -rf lib/{gsm, portmixer, sox, spandsp} @@ -144,9 +144,9 @@ chmod -x contrib/tcl/README.txt ( cd lib/libiax2 -%patch20 -p1 -b .iaxmakefile -%patch21 -p1 -b .iaxfmtsecurity -%patch22 -p1 -b .iaxsocket +%patch -P20 -p1 -b .iaxmakefile +%patch -P21 -p1 -b .iaxfmtsecurity +%patch -P22 -p1 -b .iaxsocket sed -i 's|${exec_prefix}/lib|${exec_prefix}/%{_lib}|g' iax-config.in sed -i 's|/usr/lib|%{_libdir}|g' iax-config.in @@ -154,7 +154,7 @@ sed -i 's|/usr/lib|%{_libdir}|g' iax-config.in autoreconf -vif ) -%patch23 -p1 -b .c99 +%patch -P23 -p1 -b .c99 %build ( From 2e2024d59f07bca350baeea481e7cff12d53d9bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:03:26 +0000 Subject: [PATCH 2/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- iaxclient.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iaxclient.spec b/iaxclient.spec index 7f7e0ff..8899089 100644 --- a/iaxclient.spec +++ b/iaxclient.spec @@ -7,7 +7,7 @@ Name: iaxclient Version: %{mainver} -Release: 0.48.%{betaver}%{?dist} +Release: 0.49.%{betaver}%{?dist} Summary: Library for creating telephony solutions that interoperate with Asterisk License: LGPLv2+ URL: http://iaxclient.wiki.sourceforge.net/ @@ -255,6 +255,9 @@ ln -s iaxcli iaxcli-Linux-%{tkphonearch} %{_datadir}/pixmaps/wxiax.png %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.1-0.49.beta3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 2.1-0.48.beta3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 58f4bc1afd0aad2de2ea08523f5c049bce9c3c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 08:50:46 +0200 Subject: [PATCH 3/7] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- iaxclient.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/iaxclient.spec b/iaxclient.spec index 8899089..e951865 100644 --- a/iaxclient.spec +++ b/iaxclient.spec @@ -7,9 +7,10 @@ Name: iaxclient Version: %{mainver} -Release: 0.49.%{betaver}%{?dist} +Release: 0.50.%{betaver}%{?dist} Summary: Library for creating telephony solutions that interoperate with Asterisk -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ URL: http://iaxclient.wiki.sourceforge.net/ Source0: http://downloads.sourceforge.net/iaxclient/%{name}-%{version}%{betaver}.tar.gz Source1: tkiaxphone.desktop @@ -91,7 +92,8 @@ developing applications that use %{name}. %package -n tcl-iaxclient Summary: Tcl interface to iax2 client lib Version: %{tclver} -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD Requires: tcl(abi) = 8.6 Requires: %{name} = %{mainver}-%{release} @@ -101,7 +103,8 @@ Tcl extensions to iaxclient libraries. %package -n tkiaxphone Summary: Tk IAX Phone Client Version: %{mainver} -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ Requires: tcl(abi) = 8.6 Requires: %{name} = %{mainver}-%{release} @@ -111,7 +114,8 @@ Tk IAX Phone Client. %package -n wxiax Summary: wx IAX Phone Client Version: %{mainver} -License: LGPLv2+ +# Automatically converted from old format: LGPLv2+ - review is highly recommended. +License: LicenseRef-Callaway-LGPLv2+ Requires: %{name} = %{mainver}-%{release} %description -n wxiax @@ -255,6 +259,9 @@ ln -s iaxcli iaxcli-Linux-%{tkphonearch} %{_datadir}/pixmaps/wxiax.png %changelog +* Mon Sep 02 2024 Miroslav Suchý - 2.1-0.50.beta3 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 2.1-0.49.beta3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c0eab54b5e35720d11e89331310e16333e0f6e54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 06:48:14 +0000 Subject: [PATCH 4/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- iaxclient.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iaxclient.spec b/iaxclient.spec index e951865..c06f68e 100644 --- a/iaxclient.spec +++ b/iaxclient.spec @@ -7,7 +7,7 @@ Name: iaxclient Version: %{mainver} -Release: 0.50.%{betaver}%{?dist} +Release: 0.51.%{betaver}%{?dist} Summary: Library for creating telephony solutions that interoperate with Asterisk # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -259,6 +259,9 @@ ln -s iaxcli iaxcli-Linux-%{tkphonearch} %{_datadir}/pixmaps/wxiax.png %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.1-0.51.beta3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 02 2024 Miroslav Suchý - 2.1-0.50.beta3 - convert license to SPDX From 871c73689a759c488aaac5c57c0f798d4d905845 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 24 Jan 2025 14:58:12 +0100 Subject: [PATCH 5/7] BR: tk < 1:9 --- iaxclient.spec | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/iaxclient.spec b/iaxclient.spec index c06f68e..6d2be9e 100644 --- a/iaxclient.spec +++ b/iaxclient.spec @@ -1,13 +1,13 @@ %global betaver beta3 %global tclver 0.2 %global mainver 2.1 -%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)} +%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh8.6)} %{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}} %global tkphonearch %{_arch} Name: iaxclient Version: %{mainver} -Release: 0.51.%{betaver}%{?dist} +Release: 0.52.%{betaver}%{?dist} Summary: Library for creating telephony solutions that interoperate with Asterisk # Automatically converted from old format: LGPLv2+ - review is highly recommended. License: LicenseRef-Callaway-LGPLv2+ @@ -44,12 +44,24 @@ Patch21: iax-0.2.3_format-security.patch Patch22: iax-0.2.3_socket.patch Patch23: iaxclient-c99.patch +BuildRequires: desktop-file-utils BuildRequires: gcc-c++ +BuildRequires: gsm-devel +BuildRequires: gtk3-devel +BuildRequires: ilbc-devel +BuildRequires: libogg-devel +BuildRequires: liboggz-devel +BuildRequires: libtheora-devel +BuildRequires: libtool +BuildRequires: libvidcap-devel BuildRequires: make -BuildRequires: speex-devel, libtheora-devel, gsm-devel, portaudio-devel -BuildRequires: tk-devel, gtk3-devel, SDL-devel, libogg-devel, liboggz-devel -BuildRequires: wxGTK-devel, libvidcap-devel, desktop-file-utils, libtool -BuildRequires: spandsp-devel, ilbc-devel, speexdsp-devel +BuildRequires: portaudio-devel +BuildRequires: SDL-devel +BuildRequires: spandsp-devel +BuildRequires: speex-devel +BuildRequires: speexdsp-devel +BuildRequires: tk-devel < 1:9 +BuildRequires: wxGTK-devel %description Iaxclient is an open source, multiplatform library for creating telephony @@ -167,7 +179,7 @@ cd lib/libiax2 make %{?_smp_mflags} UCFLAGS="%{optflags}" ) -%configure --disable-static +%configure --disable-static --with-wish=%{_bindir}/wish8.6 # sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool # sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} LIBTOOL="%{_bindir}/libtool" @@ -213,10 +225,6 @@ cd %{buildroot}%{tcl_sitearch}/iaxclient/tkphone/ ln -s iaxcli iaxcli-Linux-%{tkphonearch} -%ldconfig_scriptlets - -%ldconfig_scriptlets libiax - %files %doc AUTHORS ChangeLog README %license COPYING.LIB @@ -259,6 +267,9 @@ ln -s iaxcli iaxcli-Linux-%{tkphonearch} %{_datadir}/pixmaps/wxiax.png %changelog +* Sun Jan 19 2025 Sandro Mani - 2.1-0.52.beta3 +- BR: tk-devel < 1:9 + * Fri Jan 17 2025 Fedora Release Engineering - 2.1-0.51.beta3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From dc7a619c7fe65cfe3d224158dc3833a4a94126ad Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 31 May 2025 19:09:16 +0200 Subject: [PATCH 6/7] Set proper license --- iaxclient.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/iaxclient.spec b/iaxclient.spec index 6d2be9e..247e6b7 100644 --- a/iaxclient.spec +++ b/iaxclient.spec @@ -9,8 +9,7 @@ Name: iaxclient Version: %{mainver} Release: 0.52.%{betaver}%{?dist} Summary: Library for creating telephony solutions that interoperate with Asterisk -# Automatically converted from old format: LGPLv2+ - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2+ +License: LGPL-2.0-or-later URL: http://iaxclient.wiki.sourceforge.net/ Source0: http://downloads.sourceforge.net/iaxclient/%{name}-%{version}%{betaver}.tar.gz Source1: tkiaxphone.desktop @@ -104,8 +103,7 @@ developing applications that use %{name}. %package -n tcl-iaxclient Summary: Tcl interface to iax2 client lib Version: %{tclver} -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD-3-Clause-No-Nuclear-License Requires: tcl(abi) = 8.6 Requires: %{name} = %{mainver}-%{release} @@ -115,8 +113,7 @@ Tcl extensions to iaxclient libraries. %package -n tkiaxphone Summary: Tk IAX Phone Client Version: %{mainver} -# Automatically converted from old format: LGPLv2+ - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2+ +License: LGPL-2.0-or-later Requires: tcl(abi) = 8.6 Requires: %{name} = %{mainver}-%{release} @@ -126,8 +123,7 @@ Tk IAX Phone Client. %package -n wxiax Summary: wx IAX Phone Client Version: %{mainver} -# Automatically converted from old format: LGPLv2+ - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2+ +License: LGPL-2.0-or-later Requires: %{name} = %{mainver}-%{release} %description -n wxiax From 9c51f9a3cf28afdea1a006921db156c23f5b6dca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:28:48 +0000 Subject: [PATCH 7/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- iaxclient.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iaxclient.spec b/iaxclient.spec index 247e6b7..028f838 100644 --- a/iaxclient.spec +++ b/iaxclient.spec @@ -7,7 +7,7 @@ Name: iaxclient Version: %{mainver} -Release: 0.52.%{betaver}%{?dist} +Release: 0.53.%{betaver}%{?dist} Summary: Library for creating telephony solutions that interoperate with Asterisk License: LGPL-2.0-or-later URL: http://iaxclient.wiki.sourceforge.net/ @@ -263,6 +263,9 @@ ln -s iaxcli iaxcli-Linux-%{tkphonearch} %{_datadir}/pixmaps/wxiax.png %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.1-0.53.beta3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Sandro Mani - 2.1-0.52.beta3 - BR: tk-devel < 1:9