diff --git a/.gitignore b/.gitignore index 7de163a..a2e9b65 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/wsjtx-1.8.0-rc2.tgz +wsjtx-*.tgz diff --git a/sources b/sources index d87c069..5064f72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wsjtx-1.8.0-rc2.tgz) = ef15397bd3a829cbf0ab538f06a277bbe12b5cf01358540c82696a3e84d7586a86640defb8aeec6eb6f803cc0722ecd7ca685ef64c22b5d6c8446d7ebfa828fd +SHA512 (wsjtx-1.8.0.tgz) = 793e88604661b03e2e6d5a910ea4045f800b9c59174af3286fd8afdaf65d8a3ca7d1aeae557c6afc66d9bbe398be8c7030950dda03d6bc6279061c3a3107beaa diff --git a/wsjtx-1.8.0-compile-fix.patch b/wsjtx-1.8.0-compile-fix.patch index ec17512..e3ee1fe 100644 --- a/wsjtx-1.8.0-compile-fix.patch +++ b/wsjtx-1.8.0-compile-fix.patch @@ -1,8 +1,8 @@ diff --git a/wsjtx/CMakeLists.txt b/wsjtx/CMakeLists.txt -index 3943107..86dcf56 100644 +index d5e64f8..807797e 100644 --- a/wsjtx/CMakeLists.txt +++ b/wsjtx/CMakeLists.txt -@@ -778,11 +778,11 @@ find_program(ETAGS etags) +@@ -826,11 +826,11 @@ find_program(ETAGS etags) # # Boost # @@ -16,7 +16,7 @@ index 3943107..86dcf56 100644 if (Boost_FOUND) include_directories (${Boost_INCLUDE_DIRS}) endif () -@@ -800,7 +800,7 @@ find_package (FFTW3 COMPONENTS double single threads REQUIRED) +@@ -848,7 +848,7 @@ find_package (FFTW3 COMPONENTS double single threads REQUIRED) # # libhamlib setup # @@ -25,7 +25,7 @@ index 3943107..86dcf56 100644 find_package (hamlib 3 REQUIRED) find_program (RIGCTL_EXE rigctl) find_program (RIGCTLD_EXE rigctld) -@@ -1354,20 +1354,6 @@ install (TARGETS jt9 jt65code qra64code qra64sim jt9code jt4code +@@ -1415,20 +1415,6 @@ install (TARGETS jt9 jt65code qra64code qra64sim jt9code jt4code BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime ) diff --git a/wsjtx.spec b/wsjtx.spec index 180dc09..022f826 100644 --- a/wsjtx.spec +++ b/wsjtx.spec @@ -1,8 +1,8 @@ -%global rctag rc2 +#%%global rctag rc2 Name: wsjtx Version: 1.8.0 -Release: 0.3%{?rctag:.%{rctag}}%{?dist} +Release: 1%{?rctag:.%{rctag}}%{?dist} Summary: Weak Signal communication by K1JT License: GPLv3+ URL: http://physics.princeton.edu/pulsar/k1jt/wsjtx.html @@ -92,6 +92,11 @@ install -p -m 0644 -t %{buildroot}%{_datadir}/doc/%{name} GUIcontrols.txt jt9.tx %{_datadir}/%{name} %changelog +* Mon Jan 15 2018 Jaroslav Škarvada - 1.8.0-1 +- New version + Resolves: rhbz#1534099 +- De-fuzzified compile-fix patch + * Fri Sep 8 2017 Jaroslav Škarvada - 1.8.0-0.3.rc2 - Dropped rigctl*-wsjtx (hamlib copy)