diff --git a/0001-fix-kiran-biometrics-Add-the-enable-zlog-ex-macro-fo-98f402e6.patch b/0001-fix-kiran-biometrics-Add-the-enable-zlog-ex-macro-fo-98f402e6.patch deleted file mode 100644 index 00c5325..0000000 --- a/0001-fix-kiran-biometrics-Add-the-enable-zlog-ex-macro-fo-98f402e6.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 98f402e67e9a4a78e6461ecbddf3ab7c4ba05419 Mon Sep 17 00:00:00 2001 -From: wangxiaoqing -Date: Tue, 25 Jan 2022 17:16:12 +0800 -Subject: [PATCH] fix(kiran-biometrics): Add the enable zlog ex macro for zlog -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 添加ENABLE_ZLOG_EX宏来兼容不同版本的zlog - -Signed-off-by: wangxiaoqing ---- - src/CMakeLists.txt | 13 ++++++++++++- - src/kiran-biometrics.c | 4 ++++ - src/main.c | 11 +++++++++++ - 3 files changed, 27 insertions(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a1891ca..c0ab353 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -9,7 +9,18 @@ if (DEFINED HAVE_KIRAN_FACE) - pkg_check_modules (ZMQ REQUIRED libzmq) - pkg_check_modules (GLIB_JSON REQUIRED json-glib-1.0) - endif() --pkg_check_modules (ZLOG REQUIRED zlog) -+ -+if (ENABLE_ZLOG_EX) -+ pkg_search_module(ZLOG REQUIRED zlog) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_ZLOG_EX") -+else() -+ find_library(ZLOG_LIBRARY zlog) -+ set (ZLOG_INCLUDE_DIRS "") -+ set (ZLOG_LIBRARIES "${ZLOG_LIBRARY}") -+endif() -+ -+message("found zlog dirs: ${ZLOG_INCLUDE_DIRS}") -+message("found zlog libs: ${ZLOG_LIBRARIES}") - - configure_file(${SRC_DIR}/config.h.in config.h) - configure_file(${SRC_DIR}/kiran-biometrics-i.h.in kiran-biometrics-i.h) -diff --git a/src/kiran-biometrics.c b/src/kiran-biometrics.c -index 538cb41..68e1cd6 100644 ---- a/src/kiran-biometrics.c -+++ b/src/kiran-biometrics.c -@@ -21,7 +21,11 @@ - #include - #include - #include -+#ifdef ENABLE_ZLOG_EX - #include -+#else -+#include -+#endif - - #include "kiran-biometrics.h" - #include "kiran-fprint-manager.h" -diff --git a/src/main.c b/src/main.c -index 536e32c..547ff54 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -21,7 +21,11 @@ - #include - #include - #include -+#ifdef ENABLE_ZLOG_EX - #include -+#else -+#include -+#endif - #include "kiran-biometrics.h" - - -@@ -34,8 +38,15 @@ int main (int argc, char **argv) - DBusGProxy *driver_proxy; - guint request_name_ret; - -+#ifdef ENABLE_ZLOG_EX - if (dzlog_init_ex (NULL, "kylinsec-system", "kiran-biometrics", "kiran_biometrics_manager") < 0) -+#else -+ if (dzlog_init("/etc/zlog.conf", "kylinsec-system") < 0) -+#endif -+ { -+ g_error ("zlog init failed!"); - return -1; -+ } - - setlocale(LC_ALL, ""); - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); --- -2.27.0 - diff --git a/kiran-biometrics-0.0.2.tar.gz b/kiran-biometrics-0.0.2.tar.gz deleted file mode 100644 index aed9aff..0000000 Binary files a/kiran-biometrics-0.0.2.tar.gz and /dev/null differ diff --git a/kiran-biometrics-0.0.3.tar.gz b/kiran-biometrics-0.0.3.tar.gz new file mode 100644 index 0000000..b47344d Binary files /dev/null and b/kiran-biometrics-0.0.3.tar.gz differ diff --git a/kiran-biometrics.spec b/kiran-biometrics.spec index 368fe20..a1dd354 100644 --- a/kiran-biometrics.spec +++ b/kiran-biometrics.spec @@ -1,16 +1,14 @@ %global on_openeuler 1 Name: kiran-biometrics -Version: 0.0.2 -Release: 2.kb3 +Version: 0.0.3 +Release: 1 Summary: Kiran Desktop kiran-biometrics -License: Mulan PSL v2 +License: MulanPSL-2.0 URL: http://www.kylinsec.com.cn Source0: %{name}-%{version}.tar.gz -Patch0: 0001-fix-kiran-biometrics-Add-the-enable-zlog-ex-macro-fo-98f402e6.patch - BuildRequires: glib2-devel BuildRequires: dbus-glib-devel %if 0%{?on_openeuler} @@ -88,6 +86,12 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_includedir}/kiran-biometrics/kiran-biometrics-i.h %changelog +* Thu Oct 27 2022 wangxiaoqing - 0.0.3-1 +- KYOS-B: Do not exit when zlog init failed. + +* Wed Aug 10 2022 luoqing - 0.0.2-2.kb4 +- KYOS-F: Modify license and add yaml file. + * Tue Jan 25 2022 longcheng - 0.0.2-2.kb3 - KYOS-B: remove BuildRequires: fingerprint-sdk-devel in openeuler - KYOS-F:Add the enable zlog ex macro for zlog. diff --git a/kiran-biometrics.yaml b/kiran-biometrics.yaml new file mode 100644 index 0000000..5c7933f --- /dev/null +++ b/kiran-biometrics.yaml @@ -0,0 +1,4 @@ +version_control: gitee +src_repo: https://gitee.com/openeuler/kiran-biometrics.git +tag_prefix: "v" +seperator: "."