Merge tag '0.5.2'

* tag '0.5.2':
  Update version to 0.5.2
  Update CMake config COMPATIBILITY to match SONAME
  Persist CMake variables used during multiple builds in cache
  Update Github Actions workflow for MacOS builds
  Update Github Actions workflow for Fedora builds

CMakeLists.txt

@@ -8,7 +8,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(tr31
-	VERSION 0.5.1
+	VERSION 0.5.2
 	DESCRIPTION "Key block library and tools for ANSI X9.143, ASC X9 TR-31 and ISO 20038"
 	HOMEPAGE_URL "https://github.com/openemv/tr31"
 	LANGUAGES C
@@ -115,7 +115,7 @@ configure_package_config_file(cmake/tr31Config.cmake.in
 )
 write_basic_package_version_file(
 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/tr31ConfigVersion.cmake"
-	COMPATIBILITY AnyNewerVersion
+	COMPATIBILITY SameMinorVersion
 )
 install(FILES
 	"${CMAKE_CURRENT_BINARY_DIR}/cmake/tr31Config.cmake"

README.md

@@ -33,7 +33,7 @@ Installation
 
 * For Ubuntu 20.04 LTS (Focal) or Ubuntu 22.04 LTS (Jammy), install the
   appropriate [release package](https://github.com/openemv/tr31/releases)
-* For Fedora 36, Fedora 37 or Fedora 38, install the appropriate
+* For Fedora 37, Fedora 38 or Fedora 39, install the appropriate
   [release package](https://github.com/openemv/tr31/releases)
 * For Gentoo, use  the
   [OpenEMV overlay](https://github.com/openemv/openemv-overlay), set the

rpm_changelog.txt

@@ -1,3 +1,6 @@
+* Sun Dec 24 2023 Leon Lynch <[email protected]> - 0.5.2-1
+- Update to tr31-0.5.2
+
 * Sun Aug 06 2023 Leon Lynch <[email protected]> - 0.5.1-1
 - Update to tr31-0.5.1
 

src/CMakeLists.txt

@@ -64,7 +64,8 @@ if(NOT HAVE_STRPTIME)
 	check_symbol_exists(strptime time.h HAVE_STRPTIME)
 	list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D${TIME_H_DEFINITIONS_TRY})
 	if(HAVE_STRPTIME)
-		set(TIME_H_DEFINITIONS ${TIME_H_DEFINITIONS_TRY})
+		# set as cache entry to persist across multiple builds
+		set(TIME_H_DEFINITIONS ${TIME_H_DEFINITIONS_TRY} CACHE INTERNAL "Definitions required for time.h")
 	endif()
 endif()
 check_symbol_exists(timegm time.h HAVE_TIMEGM)
@@ -74,7 +75,8 @@ if(NOT HAVE_TIMEGM)
 	check_symbol_exists(timegm time.h HAVE_TIMEGM)
 	list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -D${TIME_H_DEFINITIONS_TRY})
 	if(HAVE_TIMEGM)
-		set(TIME_H_DEFINITIONS ${TIME_H_DEFINITIONS_TRY})
+		# set as cache entry to persist across multiple builds
+		set(TIME_H_DEFINITIONS ${TIME_H_DEFINITIONS_TRY} CACHE INTERNAL "Definitions required for time.h")
 	endif()
 endif()
 if(WIN32)
@@ -84,10 +86,12 @@ endif()
 # conversion. If strptime() is absent, sscanf() will be used instead.
 if(HAVE_SETLOCALE AND (HAVE_TIMEGM OR HAVE_MKGMTIME))
 	message(STATUS "Enabling date/time conversion")
-	set(TR31_ENABLE_DATETIME_CONVERSION ON)
+	# set as cache entry to persist across multiple builds
+	set(TR31_ENABLE_DATETIME_CONVERSION ON CACHE INTERNAL "Date/time conversion availability")
 else()
 	message(STATUS "Disabling date/time conversion; some tests may fail")
-	set(TR31_ENABLE_DATETIME_CONVERSION OFF)
+	# set as cache entry to persist across multiple builds
+	set(TR31_ENABLE_DATETIME_CONVERSION OFF CACHE INTERNAL "Date/time conversion availability")
 endif()
 
 include(GNUInstallDirs) # provides CMAKE_INSTALL_* variables and good defaults for install()