diff --git a/.gitignore b/.gitignore index 0ad32c3..e8ccc2e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ TrustedQSL-1.11.tar.gz /tqsl-2.2.2.tar.gz /tqsl-2.3.tar.gz /tqsl-2.3.1.tar.gz +/tqsl-2.4.tar.gz diff --git a/sources b/sources index 18b7e35..3113f18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tqsl-2.3.1.tar.gz) = edaa21b1605bcb38790a66d61e1498a04f41c4f9b3b577908a6e57cd38e1ac2e1724e9c6d5421e0ca4a4ea72d1d5f5d54f08bf5a6c202bf68181ec12f27d4afd +SHA512 (tqsl-2.4.tar.gz) = a0420791cf85837d7c340abee4b520268f3ca7bdc738bc6dc44ddaa4a23bde4b84a5e8874c428e670b1e4802af88ead2ceef5c9db99b76e62f58ef2dbe59d096 diff --git a/tqsl-tqsllib.patch b/tqsl-tqsllib.patch index b8cc3c0..529cfda 100644 --- a/tqsl-tqsllib.patch +++ b/tqsl-tqsllib.patch @@ -1,16 +1,10 @@ --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -51,10 +51,12 @@ add_library(${TQSLLIBNAME} ${TQSLLIBTYPE - target_link_libraries(${TQSLLIBNAME} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES} ${BDB_LIBRARIES} ${CARBON_LIBRARY}) +@@ -49,6 +49,7 @@ endif() + add_library(${TQSLLIBNAME} ${TQSLLIBTYPE} ${TQSLLIB_SRC} ${TQSLLIB_HDR} ${TQSLLIB_RCFILE}) + target_link_libraries(${TQSLLIBNAME} ${OPENSSL_LIBRARIES} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARIES} ${BDB_LIBRARIES} ${LMDB_LIBRARIES} ${CARBON_LIBRARY}) include_directories(${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${EXPAT_INCLUDE_DIR} ${BDB_INCLUDE_DIR} ${CARBON_INCLUDE_DIR}) - +set_target_properties(${TQSLLIBNAME} PROPERTIES SOVERSION ${TQSLLIB_VERSION}) -+ + if(NOT APPLE AND NOT WIN32) set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/") - set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h) --install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX)) -+install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX}) - install(FILES config.xml DESTINATION share/TrustedQSL) - install(FILES ${HEADERS_TO_INSTALL} DESTINATION include) - endif() diff --git a/trustedqsl.spec b/trustedqsl.spec index c079145..9a4cc44 100644 --- a/trustedqsl.spec +++ b/trustedqsl.spec @@ -2,17 +2,17 @@ %global libtqslver 2.5 Name: trustedqsl -Version: 2.3.1 -Release: 5%{?dist} +Version: 2.4 +Release: 1%{?dist} Summary: Tool for digitally signing Amateur Radio QSO records License: BSD URL: http://sourceforge.net/projects/trustedqsl/ -Source0: http://www.arrl.org/files/file/LoTW%20Instructions/%{srcname}-%{version}.tar.gz +Source0: https://sourceforge.net/projects/%{name}/files/TrustedQSL/v%{version}/%{srcname}-%{version}.tar.gz Source1: tqsl.appdata.xml -Patch0: tqsl-2.0-rpath.patch -Patch1: tqsl-tqsllib.patch +#Patch0: tqsl-2.0-rpath.patch +#Patch1: tqsl-tqsllib.patch BuildRequires: gcc-c++ BuildRequires: cmake%{?rhel:3} @@ -144,6 +144,9 @@ fi %changelog +* Mon Apr 02 2018 Richard Shaw - 2.4-1 +- Update to 2.4. + * Fri Feb 09 2018 Fedora Release Engineering - 2.3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild