diff --git a/0002-fix-cmake-qt5-cmake-command-compatible.patch b/0002-fix-cmake-qt5-cmake-command-compatible.patch new file mode 100644 index 0000000..16d0c36 --- /dev/null +++ b/0002-fix-cmake-qt5-cmake-command-compatible.patch @@ -0,0 +1,54 @@ +From ef9a87e0379051c1c89b7d8b7955fba8c1d70f28 Mon Sep 17 00:00:00 2001 +From: wangyucheng +Date: Fri, 21 Apr 2023 10:25:10 +0800 +Subject: [PATCH] fix(cmake): qt5 cmake command compatible +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 兼容qt5 cmake命令的兼容修改 +--- + src/CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cac6cb4..041f0dc 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -18,7 +18,7 @@ file(GLOB_RECURSE SRC_CPP_FILES ./*.cpp) + + ADD_DEFINITIONS(-DQT_NO_KEYWORDS) + +-qt_add_dbus_adaptor( ++qt5_add_dbus_adaptor( + AUTH_DEVICE_MANAGER_ADAPTOR_SRCS + ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.xml + ${CMAKE_SOURCE_DIR}/src/auth-device-manager.h +@@ -26,7 +26,7 @@ qt_add_dbus_adaptor( + auth_device_manager_adaptor + AuthDeviceManagerAdaptor) + +- qt_add_dbus_adaptor( ++ qt5_add_dbus_adaptor( + AUTH_DEVICE_ADAPTOR_SRCS + ${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.Device.xml + ${CMAKE_SOURCE_DIR}/src/device/auth-device.h +@@ -41,7 +41,7 @@ set(CMAKE_INSTALL_RPATH ${DEVICE_SDK}/finger-vein/sd:${DEVICE_SDK}/fingerprint/z + + + set(TS_FILES "${PROJECT_SOURCE_DIR}/translations/${PROJECT_NAME}.zh_CN.ts") +-qt_create_translation(QM_FILES ++qt5_create_translation(QM_FILES + ${CMAKE_CURRENT_SOURCE_DIR} + ${TS_FILES} + ) +@@ -80,4 +80,4 @@ install(TARGETS ${PROJECT_NAME} + + set(TRANSLATION_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/translations) + configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) +-install(FILES ${QM_FILES} DESTINATION ${TRANSLATION_INSTALL_DIR}) +\ No newline at end of file ++install(FILES ${QM_FILES} DESTINATION ${TRANSLATION_INSTALL_DIR}) +-- +2.33.0 + diff --git a/kiran-authentication-devices.spec b/kiran-authentication-devices.spec index 111a758..81ebf0d 100644 --- a/kiran-authentication-devices.spec +++ b/kiran-authentication-devices.spec @@ -1,13 +1,14 @@ Name: kiran-authentication-devices Version: 2.5.0 -Release: 3 +Release: 4 Summary: Kiran Authentication Devices License: MulanPSL-2.0 Source0: %{name}-%{version}.tar.gz Patch0001: 0001-feature-ukey-The-UKey-device-is-adapted.patch +Patch0002: 0002-fix-cmake-qt5-cmake-command-compatible.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -64,6 +65,9 @@ systemctl enable kiran-authentication-devices.service rm -rf ${buildroot} %changelog +* Fri Apr 21 2023 wangyucheng - 2.5.0-4 +- KYOS-F: qt5 cmake command compatible. + * Thu Apr 20 2023 luoqing - 2.5.0-3 - KYOS-F: Add libusb dependency.