diff --git a/0001-fix-compile-error-about-opencv.patch b/0001-ukui-biometric-manager-fix-build-error.patch similarity index 70% rename from 0001-fix-compile-error-about-opencv.patch rename to 0001-ukui-biometric-manager-fix-build-error.patch index e0838cb6b8408104ea5547df2a9658a427d9a12d..ded9bec978ec5c90e34c9e296678d63022bc0000 100644 --- a/0001-fix-compile-error-about-opencv.patch +++ b/0001-ukui-biometric-manager-fix-build-error.patch @@ -1,15 +1,16 @@ -From a3df0f59bc973a4d729dc393a74ae8982e4b9832 Mon Sep 17 00:00:00 2001 -From: huayadong -Date: Mon, 8 Apr 2024 06:38:29 +0800 -Subject: [PATCH] fix-compile-error-about-opencv +From c84fe414d981379ef6d0b229bde03ada8cb1126a Mon Sep 17 00:00:00 2001 +From: Super User +Date: Thu, 24 Oct 2024 14:51:27 +0800 +Subject: [PATCH] ukui-biometric-manager: fix build error +Signed-off-by: Super User --- biometric-manager/biometric-manager.pro | 3 +-- - biometric-plugin/biometric-plugin.pro | 4 ++-- - 2 files changed, 3 insertions(+), 4 deletions(-) + biometric-plugin/biometric-plugin.pro | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/biometric-manager/biometric-manager.pro b/biometric-manager/biometric-manager.pro -index 30f658a..6563f0f 100644 +index 7ab3ae7..9d035ee 100644 --- a/biometric-manager/biometric-manager.pro +++ b/biometric-manager/biometric-manager.pro @@ -19,8 +19,7 @@ INCLUDEPATH +=\ @@ -23,20 +24,19 @@ index 30f658a..6563f0f 100644 include ($$PWD/qt-solutions/qtsingleapplication/src/qtsingleapplication.pri) diff --git a/biometric-plugin/biometric-plugin.pro b/biometric-plugin/biometric-plugin.pro -index b602188..790031b 100644 +index ae4a54b..6e3b763 100644 --- a/biometric-plugin/biometric-plugin.pro +++ b/biometric-plugin/biometric-plugin.pro -@@ -40,8 +40,8 @@ DEFINES += QT_DEPRECATED_WARNINGS ENABLEPQ QT_MESSAGELOGCONTEXT +@@ -48,8 +48,7 @@ DEFINES += QT_DEPRECATED_WARNINGS ENABLEPQ QT_MESSAGELOGCONTEXT # 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_imgcodecs -lopencv_imgproc -lopencv_core -lpwquality ++LIBS += -L$$[QT_INSTALL_LIBS] -lgsettings-qt -lpolkit-qt5-core-1 -lopencv_imgcodecs -lopencv_imgproc -lopencv_core -lpwquality CONFIG += link_pkgconfig \ C++11 -- -2.33.0 +2.43.0 diff --git a/ukui-biometric-manager-4.0.0.0.tar.gz b/ukui-biometric-manager-4.0.0.0.tar.gz deleted file mode 100644 index a9c3bf7bbdbfdf068cf97c5901343a05839da36a..0000000000000000000000000000000000000000 Binary files a/ukui-biometric-manager-4.0.0.0.tar.gz and /dev/null differ diff --git a/ukui-biometric-manager-4.10.0.0.tar.gz b/ukui-biometric-manager-4.10.0.0.tar.gz new file mode 100755 index 0000000000000000000000000000000000000000..185e8a573df560fb9600f85e7548bd924a8d97b8 Binary files /dev/null and b/ukui-biometric-manager-4.10.0.0.tar.gz differ diff --git a/ukui-biometric-manager.spec b/ukui-biometric-manager.spec index cc183303ddbe95ab67ff2a4c946c4322a9920edc..4e7e85695f5bdf6df7486584351ca88b97fec18a 100644 --- a/ukui-biometric-manager.spec +++ b/ukui-biometric-manager.spec @@ -1,80 +1,89 @@ +Summary: Manager for biometric authentication Name: ukui-biometric-manager -Version: 4.0.0.0 -Release: 2 -Summary: manager for biometric authentication -License: GPL-2+ -URL: http://www.ukui.org +Version: 4.10.0.0 +Release: 1 +License: GPL-3+ and BSD-3-clause +URL: https://github.com/ukui/ukui-biometric-manager Source0: %{name}-%{version}.tar.gz - - -Patch01: 0001-fix-compile-error-about-opencv.patch - +Patch01: 0001-ukui-biometric-manager-fix-build-error.patch BuildRequires: glib2-devel -BuildRequires: gsettings-qt-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: opencv -BuildRequires: polkit-qt5-1-devel -BuildRequires: libpwquality-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: libukcc-devel -BuildRequires: libX11-devel -BuildRequires: pkg-config -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qttools-devel -BuildRequires: ukui-interface -BuildRequires: libkysdk-waylandhelper-devel -BuildRequires: libkysdk-qtwidgets-devel -BuildRequires: libkysdk-sysinfo-devel - - -Requires: biometric-auth -Requires: libpam-biometric - - - +BuildRequires: gsettings-qt-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: opencv +BuildRequires: polkit-qt5-1-devel +BuildRequires: libpwquality-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: libukcc-devel +BuildRequires: libX11-devel +BuildRequires: pkg-config +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel +BuildRequires: libukui-log4qt-devel +BuildRequires: libkysdk-waylandhelper-devel +BuildRequires: libkysdk-qtwidgets-devel +BuildRequires: libkysdk-sysinfo-devel >= 1.2.1.1 +BuildRequires: libkysdk-diagnostics-devel +BuildRequires: qtchooser + + +Requires: biometric-auth +Requires: libpam-biometric +Requires: libpam-biometric >= 3.20.0.10 %description - This package is a tool to manage the drivers of biometric devices and - users' features and manage whether biometric authentication is enabled. - The service is provided by biometric-authentication.service in - biometric-auth package. - + This package is a tool to manage the drivers of biometric devices and users' features and manage whether biometric authentication is enabled. The service is provided by biometric-authentication.service in biometric-auth package. %prep %autosetup -n %{name}-%{version} -p1 %build -mkdir build && cd build +mkdir build && pushd build %{qmake_qt5} .. %{make_build} +popd -%install -rm -rf $RPM_BUILD_ROOT -cd build -make INSTALL_ROOT=%{buildroot} install -mkdir -p %{buildroot}/usr/share/kylin-user-guide/data/guide +%install +pushd build +%{make_install} INSTALL_ROOT=%{buildroot} +popd -cp -r ../biometric-manager/data/biometric-manager %{buildroot}/usr/share/kylin-user-guide/data/guide +#ukui-biometric-manager +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/kylin-user-guide/data/guide +cp -r biometric-manager/data/biometric-manager $RPM_BUILD_ROOT/%{_datadir}/kylin-user-guide/data/guide -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_datadir}/man/man1/ +gzip -c man/biometric-manager.1 > $RPM_BUILD_ROOT%{_datadir}/man/man1/biometric-manager.1.gz %post +#!/bin/sh +set -e ln -sf /usr/bin/biometric-manager /usr/bin/ukui-biometric-manager -%postun -unlink /usr/bin/ukui-biometric-manager +#DEBHELPER# + %files +%license debian/copyright +%doc debian/changelog %{_bindir}/biometric-manager +%{_libdir}/ukui-control-center/libbiometrics.so %{_datadir}/applications/biometric-manager.desktop +%{_datadir}/biometric-manager/biometrics/i18n_qm/* +%{_datadir}/biometric-manager/biometrics/i18n_ts/* +%{_datadir}/biometric-manager/i18n_qm/* +%{_datadir}/kylin-user-guide/data/guide/biometric-manager/* +%{_datadir}/man/man1/biometric-manager.1.gz %{_datadir}/pixmaps/biometric-manager.png -%{_libdir}/ukui-control-center/libbiometrics.so -%{_datadir}/biometric-manager -%{_datadir}/kylin-user-guide/data/guide + %changelog +* Tue Aug 19 2025 huayadong - 4.10.0.0-1 +- Type: update +- ID : NA +- SUG : NA +- DESC: Update upstream version 4.10.0.0-ok4.5 + * Thu Nov 28 2024 huayadong - 4.0.0.0-2 - fix: %patchN is deprecated (2 usages found), use %patch N (or %patch -P N)