From f6f1bf1263cf5f4114f799dd45042706e6377d40 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Feb 18 2020 17:32:22 +0000 Subject: Fix FTBFS, RHBZ#1799183. --- diff --git a/ax25-tools.spec b/ax25-tools.spec index c10705a..9cd6a2e 100644 --- a/ax25-tools.spec +++ b/ax25-tools.spec @@ -12,10 +12,7 @@ URL: http://www.linux-ax25.org/wiki/LinuxAX25 # Official upstream is not active, moving to supported fork. # https://github.com/ve7fet/linuxax25 -# cd ax25tools; git archive --prefix=%%{name}-%%{version}/ -o %%{name}-%%{version} HEAD -#Source0: %{name}-%{version}.tar.gz -#Source0: https://github.com/ve7fet/linuxax25/archive/ax25tools-%{version}.tar.gz -Source0: ax25tools-%{version}.tar.gz +Source0: https://github.com/ve7fet/linuxax25/archive/ax25tools-%{version}.tar.gz Source1: smdiag.desktop Source2: xfhdlcchpar.desktop Source3: xfhdlcsd.desktop @@ -24,12 +21,6 @@ Source5: xfsmmixer.desktop #Temporary Icon Source6: %{name}.png -Patch0: ax25-tools-0.0.10-format-security.patch -# Sent upstream -Patch1: ax25-tools-0.0.10-rose-fix.patch -# https://groups.google.com/forum/#!topic/linux.debian.maint.hams/1UedIq27wPQ -Patch2: ax25-tools-mkiss_fix.patch - BuildRequires: automake gcc gcc-c++ BuildRequires: libax25-devel BuildRequires: ncurses-devel @@ -126,7 +117,13 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" %make_install # Install configuration files manually -make installconf DESTDIR=%{buildroot} +mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/ax25 +pushd ${RPM_BUILD_ROOT}%{_docdir}/ax25tools/conf +for f in *.dist +do + mv $f ${RPM_BUILD_ROOT}%{_sysconfdir}/ax25/${f%.dist} +done +popd # no upstream .desktop or icon yet so we'll use a temporary one mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/