From cf2751b5d8924b5c6eab64de8dcc3a1831401a84 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Thu, 19 Dec 2024 11:29:37 +0100 Subject: [PATCH] Update packaging template Signed-off-by: Jakub Jelen --- packaging/kryoptic.spec | 22 +++++++++++----------- packaging/rust2rpm.toml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packaging/kryoptic.spec b/packaging/kryoptic.spec index 6693a9fb..a1c6b67d 100644 --- a/packaging/kryoptic.spec +++ b/packaging/kryoptic.spec @@ -1,14 +1,14 @@ -# Generated by rust2rpm 26 -%bcond_without check +# Generated by rust2rpm 27 +%bcond check 1 # the only binary we provide now is conformance, which does not do anything useful %global cargo_install_bin 0 # prevent library files from being installed %global cargo_install_lib 0 -%global revision 1416ec9d4b751c21dc66ad5c66595c422665bf6d -%global short_revision 1416ec9d -%global revision_date 20240917 +%global revision 6166f28a939242ee454fc846de5ed87d2ac5a69c +%global short_revision 6166f28a +%global revision_date 20241219 Name: kryoptic Version: 0.1.0^%{revision_date}.git%{short_revision} @@ -44,20 +44,20 @@ A PKCS #11 software token written in Rust.} %cargo_prep %generate_buildrequires -%cargo_generate_buildrequires -f standard,dynamic +%cargo_generate_buildrequires -f dynamic,nssdb,standard %build -CONFDIR=%{_sysconfdir} %cargo_build -f standard,dynamic -%{cargo_license_summary -f standard,dynamic} -%{cargo_license -f standard,dynamic} > LICENSE.dependencies +CONFDIR=%{_sysconfdir} %cargo_build -f dynamic,nssdb,standard +%{cargo_license_summary -f dynamic,nssdb,standard} +%{cargo_license -f dynamic,nssdb,standard} > LICENSE.dependencies %install -%cargo_install -f standard,dynamic +%cargo_install -f dynamic,nssdb,standard install -Dp target/rpm/libkryoptic_pkcs11.so $RPM_BUILD_ROOT/%{_libdir}/libkryoptic_pkcs11.so %if %{with check} %check -%cargo_test -f standard,dynamic +%cargo_test -f dynamic,nssdb,standard %endif %files diff --git a/packaging/rust2rpm.toml b/packaging/rust2rpm.toml index 4cf4c797..22d0078e 100644 --- a/packaging/rust2rpm.toml +++ b/packaging/rust2rpm.toml @@ -4,7 +4,7 @@ cargo-install-lib = true cargo-install-bin = false [features] -enable = ["dynamic"] +enable = ["standard", "dynamic", "nssdb"] [requires] build = ["openssl-devel"]