New version

Resolves: rhbz#2008230
This commit is contained in:
Jaroslav Škarvada 2021-10-18 18:49:44 +02:00
parent e454db2d1f
commit 4d23cfc50e
4 changed files with 13 additions and 47 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
wsjtx-*.tgz
/wsjtx-*.tgz

View File

@ -1 +1 @@
SHA512 (wsjtx-2.4.0.tgz) = c40e145ccab9e7339046994a08394f5a41604762e7998431648beb4b7c3067a87e32e346e3fb74615f7be64c71151c80286ffb217589f1f7e276dcc4761a9406
SHA512 (wsjtx-2.5.0.tgz) = d5f801c9ec038a84d5b12a3843de9af7bbd6d628bd5eb8d3dd1e1621f04b319f9cc2ed01c882bf09ad3801800ee1b1fbeb49c8a9f991a2c03f3170ac192a6017

View File

@ -1,41 +0,0 @@
Index: wsjtx-2.3.0-rc3/wsjtx/CMakeLists.txt
===================================================================
--- wsjtx-2.3.0-rc3.orig/wsjtx/CMakeLists.txt
+++ wsjtx-2.3.0-rc3/wsjtx/CMakeLists.txt
@@ -855,7 +855,7 @@ find_package (FFTW3 COMPONENTS single th
#
# libhamlib setup
#
-set (hamlib_STATIC 1)
+set (hamlib_STATIC 1 CACHE BOOL "")
find_package (hamlib 3 REQUIRED)
find_program (RIGCTL_EXE rigctl)
find_program (RIGCTLD_EXE rigctld)
@@ -1545,27 +1545,6 @@ install (TARGETS ft8code jt65code qra64c
)
endif(WSJT_BUILD_UTILS)
-install (PROGRAMS
- ${RIGCTL_EXE}
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- #COMPONENT runtime
- RENAME rigctl-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
- )
-
-install (PROGRAMS
- ${RIGCTLD_EXE}
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- #COMPONENT runtime
- RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
- )
-
-install (PROGRAMS
- ${RIGCTLCOM_EXE}
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- #COMPONENT runtime
- RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
- )
-
install (FILES
README
COPYING

View File

@ -1,8 +1,8 @@
#global rctag rc4
Name: wsjtx
Version: 2.4.0
Release: 5%{?dist}
Version: 2.5.0
Release: 1%{?dist}
Summary: Weak Signal communication by K1JT
License: GPLv3+
@ -26,6 +26,7 @@ BuildRequires: desktop-file-utils
BuildRequires: hamlib-devel
BuildRequires: fftw-devel
BuildRequires: libusbx-devel
BuildRequires: systemd-devel
%if 0%{?rhel}
BuildRequires: boost169-devel
%else
@ -52,7 +53,6 @@ from the Moon.
# remove bundled hamlib
rm -f src/hamlib*.tgz* src/hamlib*.tar.gz*
tar -xzf src/%{name}.tgz
%patch0 -p1
# remove archive
rm -f src/wsjtx.tgz*
@ -85,7 +85,7 @@ cd %{name}
-DBoost_NO_SYSTEM_PATHS=FALSE \
%if 0%{?rhel}
-DBOOST_INCLUDEDIR=%{_includedir}/boost169 \
-DBOOST_LIBRARYDIR=%{_libdir}/boost169 \
-DBOOST_LIBRARYDIR=%{_libdir}/boost169 \
-DWSJT_GENERATE_DOCS=FALSE \
-DWSJT_SKIP_MANPAGES=TRUE
%endif
@ -120,6 +120,8 @@ install -p -m 0644 -t %{buildroot}%{_datadir}/doc/%{name} GUIcontrols.txt jt9.tx
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%endif
# drop wsjtx hamlib bins
rm -f %{buildroot}%{_bindir}/rigctl*-wsjtx
%files
%license COPYING
@ -136,6 +138,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%{_bindir}/message_aggregator
%{_bindir}/msk144code
%{_bindir}/q65sim
%{_bindir}/q65code
%{_bindir}/udp_daemon
%{_bindir}/wsjtx
%{_bindir}/wsjtx_app_version
@ -149,6 +152,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%changelog
* Wed Oct 13 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.5.0-1
- New version
Resolves: rhbz#2008230
* Tue Oct 12 2021 Richard Shaw <hobbes1069@gmail.com> - 2.4.0-5
- Rebuild for hamlib 4.3.1.