diff --git a/.gitignore b/.gitignore index 02fceb6..db3c4ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -uronode-*.tar.gz +/uronode-*.tar.gz diff --git a/sources b/sources index 9a5c3da..46c2028 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uronode-2.11.tar.gz) = 1d8bbeeb7f7b76a27b5609207a6e320ecd89c2edc9af34363c90892f21ebcf4a8065e36436f82d92d94b8c40075e188a8201dd98118fa9aef628dea2de618727 +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-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 b05d2c5..92c3265 100644 --- a/uronode.spec +++ b/uronode.spec @@ -8,11 +8,16 @@ Summary: Alternative packet radio system for Linux Name: uronode -Version: 2.11 -Release: 1%{?dist} -License: GPLv2+ +Version: 2.15 +Release: 13%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://uronode.sourceforge.net -BuildRequires: gcc, zlib-devel, libax25-devel, systemd +BuildRequires: make +BuildRequires: gcc +BuildRequires: zlib-devel +BuildRequires: libax25-devel +BuildRequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -23,11 +28,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 -Patch2: uronode-2.10-gcc-10-fix.patch +Patch: uronode-2.15-gcc-15-fix.patch %description URONode is an alternative packet radio system for Linux. It supports @@ -35,10 +40,7 @@ cross-port digipeating, automatic importing of flexnet routing, various IP functions, and ANSI colors. %prep -%setup -q -%patch0 -p1 -b .install-fix -%patch1 -p1 -b .configure-non-interactive -%patch2 -p1 -b .gcc-10-fix +%autosetup -p1 # Copy Fedora readme into place cp -p %{SOURCE5} README.fedora @@ -48,13 +50,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}" @@ -115,6 +117,72 @@ 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.13-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Wed Jan 27 2021 Fedora Release Engineering - 2.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 18 2021 Jaroslav Škarvada - 2.13-1 +- New version + Resolves: rhbz#1917180 + +* Wed Jul 29 2020 Fedora Release Engineering - 2.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Jaroslav Škarvada - 2.12-1 +- New version + Resolves: rhbz#1855006 + * Wed Mar 4 2020 Jaroslav Škarvada - 2.11-1 - New version Resolves: rhbz#1809815