diff --git a/0001-add-getenv.patch b/0001-add-getenv.patch new file mode 100644 index 0000000000000000000000000000000000000000..0a0294285bb22ee126ab77a5a63afcde91f46b6e --- /dev/null +++ b/0001-add-getenv.patch @@ -0,0 +1,32 @@ +From 8fe61f2bf34569b0a0995c7ae77f6fb237d01e4d Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Tue, 7 Mar 2023 15:17:03 +0800 +Subject: [PATCH] add getenv + +--- + src/drivers/community-multidevice/community_ops.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/drivers/community-multidevice/community_ops.c b/src/drivers/community-multidevice/community_ops.c +index 9766959..9f5bd15 100644 +--- a/src/drivers/community-multidevice/community_ops.c ++++ b/src/drivers/community-multidevice/community_ops.c +@@ -56,10 +56,11 @@ int community_ops_discover(bio_dev *dev) + bio_print_debug ("bio_drv_demo_ops_discover start\n"); + + int ret = 0; +- +- if ((strcmp(getenv("BIO_PRINT_LEVEL"), "7") == 0) && (strcmp(getenv("BIO_PRINT_COLOR"), "1") == 0)) +- setenv ("G_MESSAGES_DEBUG", "all", 0); +- ++ if (getenv("BIO_PRINT_LEVEL") != NULL && getenv("BIO_PRINT_COLOR") != NULL) ++ { ++ if ((strcmp(getenv("BIO_PRINT_LEVEL"), "7") == 0) && (strcmp(getenv("BIO_PRINT_COLOR"), "1") == 0)) ++ setenv ("G_MESSAGES_DEBUG", "all", 0); ++ } + // 探测设备 + ret = device_discover (dev); + if ( ret < 0 ) { +-- +2.39.1 + diff --git a/biometric-authentication.spec b/biometric-authentication.spec index 4702d4a56b4bfdba1b6af0b96b376f49026062a7..8575bd3e0d1ded26707b802f70d9bf2a2917e524 100644 --- a/biometric-authentication.spec +++ b/biometric-authentication.spec @@ -1,20 +1,11 @@ Name: biometric-authentication Version: 0.9.72 -Release: 6 +Release: 7 Summary: biometric-authentication License: LGPL-3.0 URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz - -%ifarch x86_64 -%global platform x86_64 -%endif -%ifarch aarch64 -%global platform aarch64 -%endif -%ifarch riscv64 -%global platform riscv64 -%endif +Patch01: 0001-add-getenv.patch BuildRequires: python3 BuildRequires: automake @@ -42,6 +33,7 @@ biometric identification framework Summary: libs License: LGPL-3.0 Provides: biometric-auth +Requires: libbiometric0 systemd %description -n biometric-auth Biometric Authentication Service @@ -51,6 +43,7 @@ Biometric Authentication Service Summary: libs License: LGPL-3.0 Provides: biometric-driver-community-multidevice +Requires: libbiometric0 biometric-utils %description -n biometric-driver-community-multidevice ometric Authentication Driver (community multidevice) @@ -59,6 +52,7 @@ ometric Authentication Driver (community multidevice) Summary: biometric-utils License: LGPL-3.0 Provides: biometric-utils +Requires: biometric-auth systemd python3-prettytable python3-dbus python3-gobject %description -n biometric-utils Biometric authentication utils @@ -68,6 +62,7 @@ Biometric authentication utils %package -n libbiometric-devel Summary: libbiometric-devel License: LGPL-3.0 +Requires: libbiometric0 systemd %description -n libbiometric-devel Biometric Identification DRIVER API - development files @@ -76,6 +71,7 @@ Biometric Identification DRIVER API - development files %package -n libbiometric0 Summary: libbiometric0 +Requires: systemd License: LGPL-3.0 license %description -n libbiometric0 @@ -87,7 +83,7 @@ Biometric Identification library %build export prefix=/usr ./autogen.sh -./configure --build=%{platform}-linux-gnu \ +./configure \ --prefix=/usr \ --includedir=\${prefix}/include \ --mandir=\${prefix}/share/man \ @@ -95,8 +91,7 @@ export prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --disable-silent-rules \ - --libdir=\${prefix}/lib/%{platform}-linux-gnu \ - --libexecdir=\${prefix}/lib/%{platform}-linux-gnu \ + --libdir=\${prefix}/lib64 \ --disable-dependency-tracking \ --enable-static \ --enable-shared \ @@ -160,16 +155,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/locale/pt/LC_MESSAGES/biometric-authentication.mo %{_datadir}/locale/ru/LC_MESSAGES/biometric-authentication.mo %{_datadir}/locale/zh_CN/LC_MESSAGES/biometric-authentication.mo -/usr/lib/%{platform}-linux-gnu/libbiometric.a -/usr/lib/%{platform}-linux-gnu/libbiometric.la -/usr/lib/%{platform}-linux-gnu/libbiometric.so -/usr/lib/%{platform}-linux-gnu/libbiometric.so.0 -/usr/lib/%{platform}-linux-gnu/libbiometric.so.0.0.0 -/usr/lib/%{platform}-linux-gnu/pkgconfig/libbiometric.pc +%{_libdir}/libbiometric.* +%{_libdir}/pkgconfig/libbiometric.pc %changelog +* Thu Mar 07 2023 peijiankang - 0.9.72-7 +- fix biometric-authentication error + * Wed Mar 01 2023 misaka00251 - 0.9.72-6 - Fix riscv64 build error