update version to 3.1.2

(cherry picked from commit 572a0961cfc510bc3360b7699376d8057e77f412)

0001-fix-compile-error-about-opencv.patch

@@ -0,0 +1,43 @@
+From f32788b7b789fab7e65fe31595896f2afe54b587 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Thu, 25 May 2023 08:34:56 +0800
+Subject: [PATCH 1/3] fix compile error about opencv
+
+---
+ biometric-manager/biometric-manager.pro | 4 ++--
+ biometric-plugin/biometric-plugin.pro   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/biometric-manager/biometric-manager.pro b/biometric-manager/biometric-manager.pro
+index dbafcda..f31a54c 100644
+--- a/biometric-manager/biometric-manager.pro
++++ b/biometric-manager/biometric-manager.pro
+@@ -19,8 +19,8 @@ INCLUDEPATH +=\
+ 
+ PREFIX = /usr/share/biometric-manager
+ LIBS +=-lpthread
+-LIBS +=-lX11 -lopencv_img_hash \
+-       -lopencv_ximgproc -lopencv_imgcodecs -lopencv_imgproc -lopencv_core
++LIBS +=-lX11 \
++       -lopencv_imgproc -lopencv_imgcodecs -lopencv_core
+ 
+ 
+ include ($$PWD/qt-solutions/qtsingleapplication/src/qtsingleapplication.pri)
+diff --git a/biometric-plugin/biometric-plugin.pro b/biometric-plugin/biometric-plugin.pro
+index 80a8cd2..37da360 100644
+--- a/biometric-plugin/biometric-plugin.pro
++++ b/biometric-plugin/biometric-plugin.pro
+@@ -38,8 +38,8 @@ DEFINES += QT_DEPRECATED_WARNINGS ENABLEPQ
+ # You can also select to disable deprecated APIs only up to a certain version of Qt.
+ #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+ 
+-LIBS          +=  -L$$[QT_INSTALL_LIBS] -lgsettings-qt -lpolkit-qt5-core-1 -lopencv_img_hash \
+-       -lopencv_ximgproc -lopencv_imgcodecs -lopencv_imgproc -lopencv_core -lpwquality
++LIBS          +=  -L$$[QT_INSTALL_LIBS] -lgsettings-qt -lpolkit-qt5-core-1 \
++       -lopencv_imgproc -lopencv_imgcodecs -lopencv_core -lpwquality
+ 
+ CONFIG        += link_pkgconfig \
+                  C++11
+-- 
+2.39.1
+

0002-fix-compile-error-about-glib2.patch

@@ -0,0 +1,38 @@
+From c6458552be38e59784fb95656bbd6f176bdbab69 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Thu, 25 May 2023 08:35:48 +0800
+Subject: [PATCH 2/3] fix compile error about glib2
+
+---
+ biometric-manager/src/giodbus.cpp | 2 +-
+ biometric-plugin/giodbus.cpp      | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/biometric-manager/src/giodbus.cpp b/biometric-manager/src/giodbus.cpp
+index 9c8bdc3..af620f3 100644
+--- a/biometric-manager/src/giodbus.cpp
++++ b/biometric-manager/src/giodbus.cpp
+@@ -18,7 +18,7 @@
+ 
+ #include "giodbus.h"
+ #include <gio/gio.h>
+-#include <gio-unix-2.0/gio/gunixfdlist.h>
++#include <glib-2.0/gio/gunixfdlist.h>
+ #include <glib.h>
+ 
+ int get_server_gvariant_stdout (int drvid)
+diff --git a/biometric-plugin/giodbus.cpp b/biometric-plugin/giodbus.cpp
+index 9e0490e..4ad8d27 100644
+--- a/biometric-plugin/giodbus.cpp
++++ b/biometric-plugin/giodbus.cpp
+@@ -1,6 +1,6 @@
+ #include "giodbus.h"
+ #include <gio/gio.h>
+-#include <gio-unix-2.0/gio/gunixfdlist.h>
++#include <glib-2.0/gio/gunixfdlist.h>
+ #include <glib.h>
+ 
+ int get_server_gvariant_stdout (int drvid)
+-- 
+2.39.1
+

0003-add-user-guide-of-biometric-manager.patch

@@ -0,0 +1,34 @@
+From a4feb8bed15270a5d601580dcfba583ee9b521d0 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Thu, 25 May 2023 08:37:43 +0800
+Subject: [PATCH 3/3] add user-guide of biometric-manager
+
+---
+ biometric-manager/biometric-manager.pro | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/biometric-manager/biometric-manager.pro b/biometric-manager/biometric-manager.pro
+index f31a54c..608fa65 100644
+--- a/biometric-manager/biometric-manager.pro
++++ b/biometric-manager/biometric-manager.pro
+@@ -90,7 +90,7 @@ TRANSLATIONS += i18n_ts/zh_CN.ts \
+                 i18n_ts/tr.ts \
+                 i18n_ts/es.ts
+ 
+-system("lrelease i18n_ts/*.ts")
++system("lrelease-qt5 i18n_ts/*.ts")
+ 
+ qm_file.files = i18n_ts/*.qm
+ qm_file.path = $${PREFIX}/i18n_qm/
+@@ -103,4 +103,7 @@ ICON.path = /usr/share/pixmaps/
+ desktop.files = data/biometric-manager.desktop
+ desktop.path = /usr/share/applications/
+ 
+-INSTALLS += target qm_file ICON desktop
++userguide.files = data/biometric-manager
++userguide.path = /usr/share/kylin-user-guide/data/guide
++
++INSTALLS += target qm_file ICON desktop userguide
+-- 
+2.39.1
+

ukui-biometric-manager.spec

@@ -1,22 +1,35 @@
-%define debug_package %{nil}
+#glib2-devel >= 2.74.4 glib2test 1
-Name:           ukui-biometric-manager
+%global glib2test 0
-Version:        1.0.3
+
-Release:        1
+Name:          ukui-biometric-manager
-Summary:        manager for biometric authentication
+Version:       3.1.2
-License:        GPL-2+
+Release:       1
-URL:            http://www.ukui.org
+Summary:       manager for biometric authentication
-Source0:        %{name}-%{version}.tar.gz
+License:       GPL-2+
+URL:           http://www.ukui.org
+Source0:       %{name}-%{version}.tar.gz
+Patch01:       0001-fix-compile-error-about-opencv.patch
+#glib2-devel >= 2.74.4 apply pathch02
+%if %{?glib2test}
+Patch02:       0002-fix-compile-error-about-glib2.patch
+%endif
+Patch03:       0003-add-user-guide-of-biometric-manager.patch
+
+
 
 BuildRequires: qt5-qtbase-devel
-BuildRequires: gsettings-qt-devel
-BuildRequires: glib2-devel
-BuildRequires: qt5-qtx11extras-devel
 BuildRequires: kf5-kwindowsystem-devel
-BuildRequires: pkgconf
-BuildRequires: qt5-qttools-devel
 BuildRequires: libX11-devel
+BuildRequires: qt5-qtx11extras-devel
+BuildRequires: glib2-devel
 BuildRequires: opencv
-
+BuildRequires: pkgconf
+BuildRequires: gsettings-qt-devel
+BuildRequires: qt5-qttools-devel
+BuildRequires: libukcc-devel
+BuildRequires: polkit-qt5-1-devel
+BuildRequires: libpwquality-devel
+BuildRequires: qt5-qtsvg-devel
 
 
 %description
@@ -27,29 +40,37 @@ BuildRequires: opencv
 
 
 %prep
-%setup -q
+%autosetup -n %{name}-%{version} -p1
 
 %build
 mkdir build && cd build
-qmake-qt5 ..
+%{qmake_qt5} ..
-make 
+%{make_build}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd %{_builddir}/%{name}-%{version}/build
+cd build
 make INSTALL_ROOT=%{buildroot} install
 
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+ln -sf /usr/bin/biometric-manager /usr/bin/ukui-biometric-manager
+%postun
+unlink /usr/bin/biometric-manager
+
 %files
 %{_bindir}/biometric-manager
 %{_datadir}/applications/biometric-manager.desktop
 %{_datadir}/pixmaps/biometric-manager.png
-
+%{_libdir}/ukui-control-center/libbiometrics.so
+%{_datadir}/biometric-manager
+%{_datadir}/kylin-user-guide/data/guide
 
 %changelog
+* Wed May 24 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-1
+- update version to 3.1.2
+
 * Wed May 25 2022 tanyulong <tanyulong@kylinos.cn> - 1.0.3-1
 - init package for openEuler

ukui-biometric-manager.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: ukui/ukui-biometric-manager
+tag_prefix: "^v"
+separator: "."