diff --git a/.gitignore b/.gitignore index 7cee16a..5003d48 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sequoia-cert-store-0.2.0.crate +/sequoia-cert-store-0.3.2.crate diff --git a/rust-sequoia-cert-store.spec b/rust-sequoia-cert-store.spec index 660cd2c..f528ebe 100644 --- a/rust-sequoia-cert-store.spec +++ b/rust-sequoia-cert-store.spec @@ -5,7 +5,7 @@ %global crate sequoia-cert-store Name: rust-sequoia-cert-store -Version: 0.2.0 +Version: 0.3.2 Release: %autorelease Summary: Certificate database interface @@ -15,8 +15,7 @@ Source: %{crates_source} # Automatically generated patch to strip foreign dependencies Patch: sequoia-cert-store-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes -# * bump sequoia-net dependency from 0.26 to 0.27 -# * expose features for crypto backends without setting a default +# * temporarily downgrade rusqlite dependency from 0.29 to 0.28 # * exclude integration tests, test data, and scripts from installed files Patch: sequoia-cert-store-fix-metadata.diff @@ -54,51 +53,23 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+crypto-nettle-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+crypto-nettle-devel %{_description} - -This package contains library source intended for building other packages which -use the "crypto-nettle" feature of the "%{crate}" crate. - -%files -n %{name}+crypto-nettle-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+crypto-openssl-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+crypto-openssl-devel %{_description} - -This package contains library source intended for building other packages which -use the "crypto-openssl" feature of the "%{crate}" crate. - -%files -n %{name}+crypto-openssl-devel -%ghost %{crate_instdir}/Cargo.toml - %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep %generate_buildrequires -# ensure all dependencies for building tests are available -%cargo_generate_buildrequires -f crypto-nettle,crypto-openssl +%cargo_generate_buildrequires %build # build with the default crypto backend (Nettle) -%cargo_build -f crypto-nettle +%cargo_build -f sequoia-openpgp/crypto-nettle %install -%cargo_install -f crypto-nettle +%cargo_install %if %{with check} %check -# run tests with the default crypto backend (Nettle) -%cargo_test -f crypto-nettle -# run tests with the OpenSSL crypto backend -%cargo_test -f crypto-openssl +%cargo_test %endif %changelog diff --git a/sequoia-cert-store-fix-metadata-auto.diff b/sequoia-cert-store-fix-metadata-auto.diff index cf6e9f7..65b6001 100644 --- a/sequoia-cert-store-fix-metadata-auto.diff +++ b/sequoia-cert-store-fix-metadata-auto.diff @@ -1,12 +1,15 @@ ---- sequoia-cert-store-0.2.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sequoia-cert-store-0.2.0/Cargo.toml 2023-05-10T21:34:03.693854+00:00 -@@ -88,10 +88,5 @@ - features = ["crypto-nettle"] +--- sequoia-cert-store-0.3.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sequoia-cert-store-0.3.2/Cargo.toml 2023-08-02T11:51:23.515080+00:00 +@@ -101,13 +101,5 @@ + ] default-features = false -[target."cfg(windows)".dev-dependencies.sequoia-openpgp] -version = "1" --features = ["crypto-cng"] +-features = [ +- "crypto-cng", +- "__implicit-crypto-backend-for-tests", +-] -default-features = false - [badges.maintenance] diff --git a/sequoia-cert-store-fix-metadata.diff b/sequoia-cert-store-fix-metadata.diff index d4f0cd6..3604dfb 100644 --- a/sequoia-cert-store-fix-metadata.diff +++ b/sequoia-cert-store-fix-metadata.diff @@ -1,32 +1,19 @@ ---- sequoia-cert-store-0.2.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sequoia-cert-store-0.2.0/Cargo.toml 2023-05-10T21:35:31.582209+00:00 +--- sequoia-cert-store-0.3.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sequoia-cert-store-0.3.2/Cargo.toml 2023-08-02T11:52:12.863201+00:00 @@ -36,6 +36,7 @@ license = "LGPL-2.0-or-later" repository = "https://gitlab.com/sequoia-pgp/sequoia-cert-store" resolver = "2" -+exclude = ["/tests/"] ++exclude = ["/tests"] [package.metadata.docs.rs] features = ["sequoia-openpgp/default"] @@ -66,7 +67,7 @@ version = "1" - [dependencies.sequoia-net] --version = "0.26" -+version = "0.27" - default-features = false - - [dependencies.sequoia-openpgp] -@@ -85,8 +86,11 @@ - - [target."cfg(not(windows))".dev-dependencies.sequoia-openpgp] - version = "1" --features = ["crypto-nettle"] - default-features = false -+ -+[features] -+crypto-nettle = ["sequoia-openpgp/crypto-nettle"] -+crypto-openssl = ["sequoia-openpgp/crypto-openssl"] - - [badges.maintenance] - status = "actively-developed" + [dependencies.rusqlite] +-version = "0.29" ++version = "0.28" + features = [ + "collation", + "blob", diff --git a/sources b/sources index 4ddd41b..0b0a891 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sequoia-cert-store-0.2.0.crate) = 805b4880ca03c36dce18b0d5c01398d372129bae8b06aaf0d0472795bef19c3d91fb468fa8316cd99d29575ec7c214d3a669bb9066c70d779baffe620f132386 +SHA512 (sequoia-cert-store-0.3.2.crate) = da8b247aef940d93eb29a0b6c9ccc11759a87876eb7b9bb4a9629b95bcf6da086175e61393040a8a7cdc7ac5e42cfe535a4d3a8e85d07c3c9bc45e25bcf64211