diff --git a/.gitignore b/.gitignore index d588134..2179242 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /openssl-sys-0.9.90.crate /openssl-sys-0.9.92.crate /openssl-sys-0.9.93.crate +/openssl-sys-0.9.95.crate diff --git a/openssl-sys-fix-metadata.diff b/openssl-sys-fix-metadata.diff index caf6e7a..8881a34 100644 --- a/openssl-sys-fix-metadata.diff +++ b/openssl-sys-fix-metadata.diff @@ -1,6 +1,6 @@ ---- openssl-sys-0.9.93/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ openssl-sys-0.9.93/Cargo.toml 2023-09-19T19:08:13.340896+00:00 -@@ -31,32 +31,15 @@ +--- openssl-sys-0.9.95/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ openssl-sys-0.9.95/Cargo.toml 2023-11-17T23:22:43.951743+00:00 +@@ -31,32 +31,16 @@ [package.metadata.pkg-config] openssl = "1.0.1" @@ -13,8 +13,8 @@ [build-dependencies.bindgen] -version = "0.64.0" --features = ["experimental"] -+version = "0.63.0" ++version = ">=0.64" + features = ["experimental"] optional = true [build-dependencies.cc] diff --git a/rust-openssl-sys.spec b/rust-openssl-sys.spec index f879706..344c616 100644 --- a/rust-openssl-sys.spec +++ b/rust-openssl-sys.spec @@ -1,11 +1,11 @@ -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate openssl-sys Name: rust-openssl-sys -Version: 0.9.93 +Version: 0.9.95 Release: %autorelease Summary: FFI bindings to OpenSSL @@ -13,7 +13,7 @@ License: MIT URL: https://crates.io/crates/openssl-sys Source: %{crates_source} # Manually created patch for downstream crate metadata changes -# * temporarily downgrade optional bindgen dependency from 0.64 to 0.63 +# * relax bindgen dependency from ^0.64 to >=0.64 # * drop feature and dependencies for unstable BoringSSL support # * drop feature and dependencies for building against vendored OpenSSL sources # * drop Windows-specific vcpkg build-dependency: @@ -21,7 +21,7 @@ Source: %{crates_source} Patch: openssl-sys-fix-metadata.diff Patch: 0001-drop-Windows-specific-references-to-vcpkg.patch -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: FFI bindings to OpenSSL.} @@ -69,7 +69,7 @@ use the "bindgen" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires diff --git a/rust2rpm.conf b/rust2rpm.conf deleted file mode 100644 index 8610dde..0000000 --- a/rust2rpm.conf +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -buildrequires = - pkgconfig(openssl) >= 1.0.1 -lib.requires = - pkgconfig(openssl) >= 1.0.1 diff --git a/rust2rpm.toml b/rust2rpm.toml new file mode 100644 index 0000000..c6bc13e --- /dev/null +++ b/rust2rpm.toml @@ -0,0 +1,4 @@ +[requires] +build = ["pkgconfig(openssl) >= 1.0.1"] +lib = ["pkgconfig(openssl) >= 1.0.1"] + diff --git a/sources b/sources index 151c572..ec96095 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openssl-sys-0.9.93.crate) = 173a8e28aeda81220a35d3a0b3c09586a235aafa4aceb65dddeccd3b94729e841ceab29b1defbfa1d959d82185c0fe13b0d998e115a098432fbd2a993ef582f0 +SHA512 (openssl-sys-0.9.95.crate) = 8a44009a416864c4deb42a9112d25fb87e2f03734a77500a1851b576d94f615ac69d934c1938f0b78fce9f41a5f8ba73586dfdc0f7d980f7d88ed920235f6495