From 9b84954c9a43a0a924e9b9e75b712efcfb6059e8 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Aug 05 2020 09:15:35 +0000
Subject: Fixed FTBFS

  Resolves: rhbz#1865629

---

diff --git a/wsjtx.spec b/wsjtx.spec
index 4f6cd06..1afd823 100644
--- a/wsjtx.spec
+++ b/wsjtx.spec
@@ -2,26 +2,26 @@
 
 Name:           wsjtx
 Version:	2.2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Weak Signal communication by K1JT
 License:	GPLv3+
 
 URL:		http://physics.princeton.edu/pulsar/k1jt/wsjtx.html
 Source0:	http://physics.princeton.edu/pulsar/k1jt/%{name}-%{version}%{?rctag:-%{rctag}}.tgz
-Source100:  wsjtx.appdata.xml
+Source100:	wsjtx.appdata.xml
 
 Patch0:		wsjtx-2.0.0-compile-fix.patch
 
 BuildRequires:	dos2unix, tar, cmake, gcc-c++, gcc-gfortran
-BuildRequires:  qt5-qtbase-devel
-BuildRequires:  qt5-linguist
-BuildRequires:  qt5-qtserialport-devel
-BuildRequires:  qt5-qtmultimedia-devel
+BuildRequires:	qt5-qtbase-devel
+BuildRequires:	qt5-linguist
+BuildRequires:	qt5-qtserialport-devel
+BuildRequires:	qt5-qtmultimedia-devel
 BuildRequires:	desktop-file-utils, hamlib-devel, fftw-devel, libusbx-devel
 BuildRequires:	boost-devel, portaudio-devel
 %if 0%{?fedora}
-BuildRequires:  asciidoc, rubygem-asciidoctor
-BuildRequires:  libappstream-glib
+BuildRequires:	asciidoc, rubygem-asciidoctor
+BuildRequires:	libappstream-glib
 %endif
 
 %description
@@ -36,14 +36,14 @@ from the Moon.
 %setup -n %{name}-%{version}%{?rctag:-%{rctag}}
 
 # remove bundled hamlib
-rm -f src/hamlib.tgz*
+rm -f src/hamlib*.tgz* src/hamlib*.tar.gz*
 tar -xzf src/%{name}.tgz
 %patch0 -p1
 
 # remove archive
 rm -f src/wsjtx.tgz*
 
-pushd %{name}
+cd %{name}
 
 %if 0%{?fedora}
 # remove bundled boost. EL 7 is not required version.
@@ -66,22 +66,21 @@ export LDFLAGS="%{?__global_ldflags}"
 # workaround for hamlib check, i.e. for hamlib_LIBRARY_DIRS not to be empty
 export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
 
-mkdir %{name}/build && cd %{name}/build
+cd %{name}
 %cmake -Dhamlib_STATIC=FALSE \
 %if 0%{?fedora}
        -DBoost_NO_SYSTEM_PATHS=FALSE \
 %else
        -DBoost_NO_SYSTEM_PATHS=TRUE \
        -DWSJT_GENERATE_DOCS=FALSE \
-       -DWSJT_SKIP_MANPAGES=TRUE \
+       -DWSJT_SKIP_MANPAGES=TRUE
 %endif
-       ..
-%make_build
+%cmake_build
 
 
 %install
-cd %{name}/build
-%make_install
+cd %{name}
+%cmake_install
 
 # Make sure the right style is used.
 desktop-file-edit --set-key=Exec --set-value="wsjtx --style=fusion" \
@@ -96,7 +95,6 @@ install -pm 0644 %{SOURCE100} %{buildroot}%{_metainfodir}/
 
 # fix docs
 rm -f %{buildroot}%{_datadir}/doc/WSJT-X/{INSTALL,COPYING,copyright,changelog.Debian.gz}
-cd ..
 mv %{buildroot}%{_datadir}/doc/WSJT-X %{buildroot}%{_datadir}/doc/%{name}
 install -p -m 0644 -t %{buildroot}%{_datadir}/doc/%{name} GUIcontrols.txt jt9.txt \
   mouse_commands.txt prefixes.txt shortcuts.txt v1.7_Features.txt \
@@ -134,6 +132,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
 
 
 %changelog
+* Wed Aug  5 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.2.2-5
+- Fixed FTBFS
+  Resolves: rhbz#1865629
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.2-4
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild