From c141d0216bbcc4d684722cd8819d6d45c8c01dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 25 Oct 2021 20:10:23 +0200 Subject: [PATCH 01/15] New version Resolves: rhbz#2016589 --- sources | 2 +- uronode-2.10-gcc-10-fix.patch | 15 --------------- uronode.spec | 11 ++++++----- 3 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 uronode-2.10-gcc-10-fix.patch diff --git a/sources b/sources index 5723ae1..46c2028 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uronode-2.14.tar.gz) = 94d8fd8f92b5b979301e9587b789f6545d463607b080767c2895d8fc7bdfe3aa62797b99e1e82213871d7f86a23969a83e1a456fc64056120c6b87c4e7b43ff2 +SHA512 (uronode-2.15.tar.gz) = c5f2b652abd9dc0ca09d0f6ec022fc2c658caf09f79547420ed0412a956906ddf7146cd15823de41afa837a8b4c9dd59f25690283471e7b648fe1c37166cee2e diff --git a/uronode-2.10-gcc-10-fix.patch b/uronode-2.10-gcc-10-fix.patch deleted file mode 100644 index cfd9a3c..0000000 --- a/uronode-2.10-gcc-10-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/util.c b/util.c -index 805b9fa..26c856c 100644 ---- a/util.c -+++ b/util.c -@@ -17,8 +17,8 @@ - #include "procinfo.h" - - static char buf[256]; --char *HostName; --char *Prompt; -+extern char *HostName; -+extern char *Prompt; - - void node_msg(const char *fmt, ...) - { diff --git a/uronode.spec b/uronode.spec index 7e6211d..98a6ec1 100644 --- a/uronode.spec +++ b/uronode.spec @@ -8,7 +8,7 @@ Summary: Alternative packet radio system for Linux Name: uronode -Version: 2.14 +Version: 2.15 Release: 1%{?dist} License: GPLv2+ URL: http://uronode.sourceforge.net @@ -27,8 +27,6 @@ Source5: uronode-README.fedora Patch0: uronode-2.7-install-fix.patch # Sent upstream Patch1: uronode-2.7-configure-non-interactive.patch -# Sent upstream -Patch2: uronode-2.10-gcc-10-fix.patch %description URONode is an alternative packet radio system for Linux. It supports @@ -36,10 +34,9 @@ cross-port digipeating, automatic importing of flexnet routing, various IP functions, and ANSI colors. %prep -%setup -qn %{name} +%setup -qn %{name}-%{version} %patch0 -p1 -b .install-fix %patch1 -p1 -b .configure-non-interactive -%patch2 -p1 -b .gcc-10-fix # Copy Fedora readme into place cp -p %{SOURCE5} README.fedora @@ -116,6 +113,10 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Mon Oct 25 2021 Jaroslav Škarvada - 2.15-1 +- New version + Resolves: rhbz#2016589 + * Fri Oct 15 2021 Jaroslav Škarvada - 2.14-1 - New version Resolves: rhbz#2014224 From 85482a41e8a6e5b8307f3242d078818aab161af9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:38:25 +0000 Subject: [PATCH 02/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index 98a6ec1..0f28aa2 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://uronode.sourceforge.net BuildRequires: make @@ -113,6 +113,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Oct 25 2021 Jaroslav Škarvada - 2.15-1 - New version Resolves: rhbz#2016589 From 20521390fcfe99c4777d3891b36672cf8392bade Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:31:20 +0000 Subject: [PATCH 03/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index 0f28aa2..3b9a700 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://uronode.sourceforge.net BuildRequires: make @@ -113,6 +113,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 46b75f4e0bc9dd72b6c4b0e4b0eb46f6e13d1a8d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:56:33 +0000 Subject: [PATCH 04/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index 3b9a700..9eed0cf 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://uronode.sourceforge.net BuildRequires: make @@ -113,6 +113,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.15-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c2e7bdd2ad77601a060a4de25a6a45594e8e324a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:14:34 +0000 Subject: [PATCH 05/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index 9eed0cf..f45de18 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://uronode.sourceforge.net BuildRequires: make @@ -113,6 +113,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.15-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 2.15-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 822026e380cabe93a314270a318955782d992e27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:15:15 +0000 Subject: [PATCH 06/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index f45de18..c580d36 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://uronode.sourceforge.net BuildRequires: make @@ -113,6 +113,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.15-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 205059b1e25ca22ced832a4797523f4422199268 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 07/15] Eliminate use of obsolete %patchN syntax (#2283636) --- uronode.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uronode.spec b/uronode.spec index c580d36..3aa3a21 100644 --- a/uronode.spec +++ b/uronode.spec @@ -35,8 +35,8 @@ various IP functions, and ANSI colors. %prep %setup -qn %{name}-%{version} -%patch0 -p1 -b .install-fix -%patch1 -p1 -b .configure-non-interactive +%patch -P0 -p1 -b .install-fix +%patch -P1 -p1 -b .configure-non-interactive # Copy Fedora readme into place cp -p %{SOURCE5} README.fedora From 28379b8cca795831ada2b7801a95938ac70f8dc0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:23:36 +0000 Subject: [PATCH 08/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index 3aa3a21..ece66b6 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: http://uronode.sourceforge.net BuildRequires: make @@ -113,6 +113,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.15-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.15-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9e4f8cf502629da47a8ce5e3f3be2f092b319bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:28:59 +0200 Subject: [PATCH 09/15] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- uronode.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/uronode.spec b/uronode.spec index ece66b6..29e0be0 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,8 +9,9 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 7%{?dist} -License: GPLv2+ +Release: 8%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://uronode.sourceforge.net BuildRequires: make BuildRequires: gcc, zlib-devel, libax25-devel, systemd @@ -113,6 +114,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Fri Jul 26 2024 Miroslav Suchý - 2.15-8 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.15-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ac6c2bf51058225f8f85e13ee0736f5803a4bd7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:54:29 +0000 Subject: [PATCH 10/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index 29e0be0..ec7072b 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 8%{?dist} +Release: 9%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://uronode.sourceforge.net @@ -114,6 +114,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.15-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 2.15-8 - convert license to SPDX From d7a37d9fa8f0a709032a637b8f2a793f54813585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 14 Apr 2025 16:22:52 +0200 Subject: [PATCH 11/15] Fixed FTBFS with gcc-15 Resolves: rhbz#2341489 --- uronode-2.15-gcc-15-fix.patch | 21 +++++++++++++++++++++ uronode.spec | 30 +++++++++++++++++------------- 2 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 uronode-2.15-gcc-15-fix.patch diff --git a/uronode-2.15-gcc-15-fix.patch b/uronode-2.15-gcc-15-fix.patch new file mode 100644 index 0000000..e28977a --- /dev/null +++ b/uronode-2.15-gcc-15-fix.patch @@ -0,0 +1,21 @@ +diff --git a/command.c b/command.c +index 99db955..ac9ba50 100644 +--- a/command.c ++++ b/command.c +@@ -5,6 +5,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -29,8 +30,6 @@ struct cmd *Nodecmds = NULL; + + int meminfo(const char *s); + +-int kill(); +- + void init_nodecmds(void) + { + add_internal_cmd(&Nodecmds, "?", 1, do_help); diff --git a/uronode.spec b/uronode.spec index ec7072b..862afce 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 9%{?dist} +Release: 10%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://uronode.sourceforge.net @@ -25,9 +25,11 @@ Source3: uronode.socket Source4: uronode.xinetd Source5: uronode-README.fedora # Sent upstream -Patch0: uronode-2.7-install-fix.patch +Patch: uronode-2.7-install-fix.patch # Sent upstream -Patch1: uronode-2.7-configure-non-interactive.patch +Patch: uronode-2.7-configure-non-interactive.patch +# Sent upstream +Patch: uronode-2.15-gcc-15-fix.patch %description URONode is an alternative packet radio system for Linux. It supports @@ -35,9 +37,7 @@ cross-port digipeating, automatic importing of flexnet routing, various IP functions, and ANSI colors. %prep -%setup -qn %{name}-%{version} -%patch -P0 -p1 -b .install-fix -%patch -P1 -p1 -b .configure-non-interactive +%autosetup -p1 # Copy Fedora readme into place cp -p %{SOURCE5} README.fedora @@ -47,13 +47,13 @@ rm -rf include %build export NON_INTERACTIVE=1 -export ETC_DIR=/etc/ax25 -export SBIN_DIR=/usr/sbin -export BIN_DIR=/usr/bin -export LIB_DIR=/usr/lib -export DATA_DIR=/usr/share -export MAN_DIR=$DATA_DIR/man -export VAR_DIR=/var +export ETC_DIR=%{_sysconfdir}/ax25 +export SBIN_DIR=%{_sbindir} +export BIN_DIR=%{_bindir} +export LIB_DIR=%{_prefix}/lib +export DATA_DIR=%{_datadir} +export MAN_DIR=%{_mandir} +export VAR_DIR=%{_var} ./configure make %{?_smp_mflags} CFLAGS="%{optflags} %{?cflags_harden}" LDFLAGS="%{?__global_ldflags} %{?ldflags_harden}" @@ -114,6 +114,10 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Mon Apr 14 2025 Jaroslav Škarvada - 2.15-10 +- Fixed FTBFS with gcc-15 + Resolves: rhbz#2341489 + * Sun Jan 19 2025 Fedora Release Engineering - 2.15-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 00b5781509c60b06db56b1d806059821b7b54fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 14 Apr 2025 19:22:45 +0200 Subject: [PATCH 12/15] Minor cosmetic changes to spec MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index 862afce..5cbe187 100644 --- a/uronode.spec +++ b/uronode.spec @@ -14,7 +14,10 @@ Release: 10%{?dist} License: GPL-2.0-or-later URL: http://uronode.sourceforge.net BuildRequires: make -BuildRequires: gcc, zlib-devel, libax25-devel, systemd +BuildRequires: gcc +BuildRequires: zlib-devel +BuildRequires: libax25-devel +BuildRequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd From e11e2e7a56dc5aec2d0632de43ab72c685867c34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:51:37 +0000 Subject: [PATCH 13/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index 5cbe187..61a81ec 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 10%{?dist} +Release: 11%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://uronode.sourceforge.net @@ -117,6 +117,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.15-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Apr 14 2025 Jaroslav Škarvada - 2.15-10 - Fixed FTBFS with gcc-15 Resolves: rhbz#2341489 From 67dbf8ad7e1e3039cde6d09c920ad9b818e349a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:40:46 +0000 Subject: [PATCH 14/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index 61a81ec..8dfcdb7 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 11%{?dist} +Release: 12%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://uronode.sourceforge.net @@ -117,6 +117,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2.15-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 2.15-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From b391adbcb90373289fcae37b8778046b32f9c277 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:15:23 +0000 Subject: [PATCH 15/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- uronode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uronode.spec b/uronode.spec index 8dfcdb7..92c3265 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,7 +9,7 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 12%{?dist} +Release: 13%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://uronode.sourceforge.net @@ -117,6 +117,9 @@ touch %{buildroot}/%{_var}/lib/flexd/destinations %ghost %{_var}/lib/flexd/destinations %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.15-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 2.15-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild