1 --- libdnf-0.70.0/cmake/modules/FindGpgme.cmake.orig 2023-04-02 08:32:33.289207745 +0200
2 +++ libdnf-0.70.0/cmake/modules/FindGpgme.cmake 2023-04-02 08:32:38.262514136 +0200
3 @@ -199,14 +199,14 @@ else() # not WIN32
4 set( GPGME_PTHREAD_FOUND false )
5 set( GPGME_PTH_FOUND false )
7 - find_program( _GPGMECONFIG_EXECUTABLE NAMES gpgme-config )
8 + find_program( _GPGMECONFIG_EXECUTABLE NAMES pkg-config )
10 # if gpgme-config has been found
11 if ( _GPGMECONFIG_EXECUTABLE )
13 message( STATUS "Found gpgme-config at ${_GPGMECONFIG_EXECUTABLE}" )
15 - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION )
16 + exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --modversion gpgme OUTPUT_VARIABLE GPGME_VERSION )
18 # set( _GPGME_MIN_VERSION "1.1.7" )
19 # macro_ensure_version( ${_GPGME_MIN_VERSION} ${GPGME_VERSION} _GPGME_INSTALLED_VERSION_OK )
20 @@ -219,17 +219,17 @@ else() # not WIN32
22 message( STATUS "Found gpgme v${GPGME_VERSION}, checking for flavours..." )
24 - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret )
25 + exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs gpgme OUTPUT_VARIABLE _gpgme_config_vanilla_libs RETURN_VALUE _ret )
27 set( _gpgme_config_vanilla_libs )
30 - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
31 + exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs gpgme OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
33 set( _gpgme_config_pthread_libs )
36 - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pth --libs OUTPUT_VARIABLE _gpgme_config_pth_libs RETURN_VALUE _ret )
37 + exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --libs gpgme OUTPUT_VARIABLE _gpgme_config_pth_libs RETURN_VALUE _ret )
39 set( _gpgme_config_pth_libs )
41 @@ -243,7 +243,7 @@ else() # not WIN32
43 if ( _gpgme_config_vanilla_libs OR _gpgme_config_pthread_libs OR _gpgme_config_pth_libs )
45 - exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE _GPGME_CFLAGS )
46 + exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --cflags gpgme OUTPUT_VARIABLE _GPGME_CFLAGS )
49 string( REGEX REPLACE "(\r?\n)+$" " " _GPGME_CFLAGS "${_GPGME_CFLAGS}" )