diff --git a/uronode-2.15-gcc-15-fix.patch b/uronode-2.15-gcc-15-fix.patch deleted file mode 100644 index e28977a..0000000 --- a/uronode-2.15-gcc-15-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 92c3265..98a6ec1 100644 --- a/uronode.spec +++ b/uronode.spec @@ -9,15 +9,11 @@ Summary: Alternative packet radio system for Linux Name: uronode Version: 2.15 -Release: 13%{?dist} -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +Release: 1%{?dist} +License: GPLv2+ URL: http://uronode.sourceforge.net BuildRequires: make -BuildRequires: gcc -BuildRequires: zlib-devel -BuildRequires: libax25-devel -BuildRequires: systemd +BuildRequires: gcc, zlib-devel, libax25-devel, systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -28,11 +24,9 @@ Source3: uronode.socket Source4: uronode.xinetd Source5: uronode-README.fedora # Sent upstream -Patch: uronode-2.7-install-fix.patch +Patch0: uronode-2.7-install-fix.patch # Sent upstream -Patch: uronode-2.7-configure-non-interactive.patch -# Sent upstream -Patch: uronode-2.15-gcc-15-fix.patch +Patch1: uronode-2.7-configure-non-interactive.patch %description URONode is an alternative packet radio system for Linux. It supports @@ -40,7 +34,9 @@ cross-port digipeating, automatic importing of flexnet routing, various IP functions, and ANSI colors. %prep -%autosetup -p1 +%setup -qn %{name}-%{version} +%patch0 -p1 -b .install-fix +%patch1 -p1 -b .configure-non-interactive # Copy Fedora readme into place cp -p %{SOURCE5} README.fedora @@ -50,13 +46,13 @@ rm -rf include %build export NON_INTERACTIVE=1 -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} +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 ./configure make %{?_smp_mflags} CFLAGS="%{optflags} %{?cflags_harden}" LDFLAGS="%{?__global_ldflags} %{?ldflags_harden}" @@ -117,43 +113,6 @@ 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