From 4425bedd99a7ff98912974131815cc4ea9adc039 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 6 Mar 2023 21:37:19 +0100 Subject: [PATCH] Update to version 1.3.0; Fixes RHBZ#2175877 --- .gitignore | 1 + rpm-sequoia-fix-metadata.diff | 11 +++++++++++ rust-rpm-sequoia.spec | 16 ++++++++++------ sources | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 rpm-sequoia-fix-metadata.diff diff --git a/.gitignore b/.gitignore index 571b85d..23db924 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /rpm-sequoia-1.0.1.crate /rpm-sequoia-1.1.2.crate /rpm-sequoia-1.2.0.crate +/rpm-sequoia-1.3.0.crate diff --git a/rpm-sequoia-fix-metadata.diff b/rpm-sequoia-fix-metadata.diff new file mode 100644 index 0000000..06b6e89 --- /dev/null +++ b/rpm-sequoia-fix-metadata.diff @@ -0,0 +1,11 @@ +--- rpm-sequoia-1.3.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ rpm-sequoia-1.3.0/Cargo.toml 2023-03-06T18:22:37.032074+00:00 +@@ -73,7 +73,7 @@ + version = "0.1.4" + + [features] +-default = ["sequoia-openpgp/crypto-nettle"] ++default = ["sequoia-openpgp/crypto-openssl"] + + [badges.maintenance] + status = "actively-developed" diff --git a/rust-rpm-sequoia.spec b/rust-rpm-sequoia.spec index 4d93f33..e8ecb8d 100644 --- a/rust-rpm-sequoia.spec +++ b/rust-rpm-sequoia.spec @@ -1,37 +1,40 @@ -# Not generated by rust2rpm 23 -# https://pagure.io/fedora-rust/rust2rpm/issue/125 +# Generated by rust2rpm 24 %bcond_without check %global crate rpm-sequoia Name: rust-rpm-sequoia -Version: 1.2.0 +Version: 1.3.0 Release: %autorelease Summary: Implementation of the RPM PGP interface using Sequoia License: LGPL-2.0-or-later URL: https://crates.io/crates/rpm-sequoia Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * default to the OpenSSL crypto backend of sequoia-openpgp +Patch: rpm-sequoia-fix-metadata.diff BuildRequires: rust-packaging >= 23 %global _description %{expand: -Implementation of the RPM PGP interface using Sequoia.} +An implementation of the RPM PGP interface using Sequoia.} %description %{_description} %package -n %{crate} Summary: %{summary} +# (MIT OR Apache-2.0) AND Unicode-DFS-2016 +# Apache-2.0 # Apache-2.0 OR MIT # BSL-1.0 # LGPL-2.0-or-later -# LGPL-3.0 OR GPL-2.0 OR GPL-3.0 # MIT # MIT OR Apache-2.0 # MIT OR Apache-2.0 OR Zlib # Unlicense OR MIT # Zlib OR Apache-2.0 OR MIT -License: LGPL-3.0 AND BSL-1.0 AND MIT +License: LGPL-2.0-or-later AND Apache-2.0 AND BSL-1.0 AND MIT AND Unicode-DFS-2016 # LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} @@ -61,6 +64,7 @@ Requires: %{crate}%{?_isa} = %{version}-%{release} %build %cargo_build +%cargo_license_summary %{cargo_license} > LICENSE.dependencies %install diff --git a/sources b/sources index 1067897..0b1008c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-sequoia-1.2.0.crate) = aca2d01fcaddeca1a1b2790116fa8b6efefd1798ad324c922346821c78b8c32fa6ae03272abcf82b5c9fb5b805901e896f897e936554c9cade0ce9891922a4e5 +SHA512 (rpm-sequoia-1.3.0.crate) = 51e54207aa950305d81045f4f9f9518798d70e5ee24507225163ee2e06b270cfe92be7c96bfb34e3c13eb73758568184799ee392e558b4713ac206590f24e58e