From 51f8bf4de07929ffce00a9d9690d001ae7337ce6 Mon Sep 17 00:00:00 2001 From: Dongsun Lee Date: Wed, 15 Nov 2023 13:11:17 +0900 Subject: [PATCH] fix bug in manifest setting --- CMakeLists.txt | 1 - packaging/webauthn-client-devel.manifest.in | 5 ----- packaging/webauthn.spec | 17 ++++++++--------- 3 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 packaging/webauthn-client-devel.manifest.in diff --git a/CMakeLists.txt b/CMakeLists.txt index ed6c41a..e843a8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,6 @@ SET(TARGET_WEBAUTHN_UNIT_TESTS "${SERVICE_NAME}-unit-tests") ############################ Configure manifest files ###################### CONFIGURE_FILE(packaging/${TARGET_WEBAUTHN_SERVER}.manifest.in ${TARGET_WEBAUTHN_SERVER}.manifest @ONLY) CONFIGURE_FILE(packaging/${TARGET_WEBAUTHN_CLIENT}.manifest.in ${TARGET_WEBAUTHN_CLIENT}.manifest @ONLY) -CONFIGURE_FILE(packaging/${TARGET_WEBAUTHN_CLIENT}-devel.manifest.in ${TARGET_WEBAUTHN_CLIENT}-devel.manifest @ONLY) CONFIGURE_FILE(packaging/${TARGET_WEBAUTHN_COMMON}.manifest.in ${TARGET_WEBAUTHN_COMMON}.manifest @ONLY) CONFIGURE_FILE(packaging/${TARGET_WEBAUTHN_UNIT_TESTS}.manifest.in ${TARGET_WEBAUTHN_UNIT_TESTS}.manifest @ONLY) diff --git a/packaging/webauthn-client-devel.manifest.in b/packaging/webauthn-client-devel.manifest.in deleted file mode 100644 index a76fdba..0000000 --- a/packaging/webauthn-client-devel.manifest.in +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packaging/webauthn.spec b/packaging/webauthn.spec index 9181346..368a0fe 100644 --- a/packaging/webauthn.spec +++ b/packaging/webauthn.spec @@ -63,8 +63,8 @@ Group: Security/Development %description -n %{name}-hal-devel HAL API of Web Authentication Service (development files) -%package unit-test -Summary: Web Authentication Service (unit test) +%package unit-tests +Summary: Web Authentication Service (unit tests) License: Apache-2.0 Group: Security/Development BuildRequires: pkgconfig(gtest) @@ -72,8 +72,8 @@ BuildRequires: pkgconfig(capi-network-bluetooth) BuildRequires: pkgconfig(capi-appfw-app-control) Requires: %{name} = %{version}-%{release} -%description unit-test -Web Authentication Service (unit test) +%description unit-tests +Web Authentication Service (unit tests) %define user_name security_fw %define group_name security_fw @@ -158,17 +158,16 @@ fi %{_unitdir}/%{name}.socket %files -n lib%{name}-common -#%manifest %{_datadir}/%{name}-common.manifest +%manifest %{name}-common.manifest %license LICENSE %{lib_dir}/lib%{name}-common.so.* %files -n lib%{name}-client -#%manifest %{_datadir}/%{name}-client.manifest +%manifest %{name}-client.manifest %license LICENSE %{lib_dir}/lib%{name}-client.so.* %files -n lib%{name}-client-devel -#%manifest %{_datadir}/%{name}-client-devel.manifest %license LICENSE %{_includedir}/webauthn.h %{lib_dir}/pkgconfig/%{name}.pc @@ -179,7 +178,7 @@ fi %{_includedir}/webauthn*.h %{lib_dir}/pkgconfig/%{name}-hal.pc -%files -n %{name}-unit-test -#%manifest %{name}-unit-test.manifest +%files -n %{name}-unit-tests +%manifest %{name}-unit-tests.manifest %license LICENSE %{bin_dir}/%{name}-unit-tests -- 2.7.4