parent
8ce82584d7
commit
481897261e
|
@ -0,0 +1,13 @@
|
|||
diff --git a/wsjtx/CMakeLists.txt b/wsjtx/CMakeLists.txt
|
||||
index dcc2b59..6bcb569 100644
|
||||
--- a/wsjtx/CMakeLists.txt
|
||||
+++ b/wsjtx/CMakeLists.txt
|
||||
@@ -949,7 +949,7 @@ endif ()
|
||||
#
|
||||
# Fortran setup
|
||||
#
|
||||
-set (General_FFLAGS "-Wall -Wno-conversion -fno-second-underscore")
|
||||
+set (General_FFLAGS "-Wall -Wno-conversion -fno-second-underscore -fallow-argument-mismatch")
|
||||
|
||||
# FFLAGS depend on the compiler
|
||||
get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME)
|
11
wsjtx.spec
11
wsjtx.spec
|
@ -2,7 +2,7 @@
|
|||
|
||||
Name: wsjtx
|
||||
Version: 2.1.2
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Weak Signal communication by K1JT
|
||||
License: GPLv3+
|
||||
|
||||
|
@ -10,6 +10,7 @@ URL: http://physics.princeton.edu/pulsar/k1jt/wsjtx.html
|
|||
Source0: http://physics.princeton.edu/pulsar/k1jt/%{name}-%{version}%{?rctag:-%{rctag}}.tgz
|
||||
|
||||
Patch0: wsjtx-2.0.0-compile-fix.patch
|
||||
Patch1: wsjtx-2.1.2-gcc-10-fix.patch
|
||||
|
||||
BuildRequires: dos2unix, tar, cmake, gcc-c++, gcc-gfortran
|
||||
BuildRequires: qt5-qtbase-devel
|
||||
|
@ -33,6 +34,7 @@ from the Moon.
|
|||
rm -f src/hamlib.tgz*
|
||||
tar -xzf src/%{name}.tgz
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# remove archive
|
||||
rm -f src/wsjtx.tgz*
|
||||
|
@ -48,7 +50,8 @@ rm -rf boost
|
|||
dos2unix *.ui *.iss *.rc *.txt
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags}"
|
||||
# Workaround for build with gcc-10, problem reported upstream
|
||||
export CFLAGS="%{optflags} -fcommon"
|
||||
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
|
||||
|
@ -107,6 +110,10 @@ install -p -m 0644 -t %{buildroot}%{_datadir}/doc/%{name} GUIcontrols.txt jt9.tx
|
|||
%{_datadir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Mon Feb 10 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.1.2-3
|
||||
- Fixed FTBFS with gcc-10
|
||||
Resolves: rhbz#1800262
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
|
|
Loading…
Reference in New Issue