diff --git a/.gitignore b/.gitignore index 4ad075f..d4d78b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/zstd-sys-2.0.8+zstd.1.5.5.crate +SOURCES/zstd-sys-2.0.9+zstd.1.5.5.crate diff --git a/.rust-zstd-sys.metadata b/.rust-zstd-sys.metadata index bf01537..834d70f 100644 --- a/.rust-zstd-sys.metadata +++ b/.rust-zstd-sys.metadata @@ -1 +1 @@ -50693345bfd4e2a3e40d470be8788a97b26b0d99 SOURCES/zstd-sys-2.0.8+zstd.1.5.5.crate +492c131e8730536c98ff8128d7e5ffb623d06900 SOURCES/zstd-sys-2.0.9+zstd.1.5.5.crate diff --git a/SOURCES/rust2rpm.conf b/SOURCES/rust2rpm.conf deleted file mode 100644 index a49f33c..0000000 --- a/SOURCES/rust2rpm.conf +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -buildrequires = - pkgconfig(libzstd) -lib.requires = - pkgconfig(libzstd) diff --git a/SOURCES/rust2rpm.toml b/SOURCES/rust2rpm.toml new file mode 100644 index 0000000..032c439 --- /dev/null +++ b/SOURCES/rust2rpm.toml @@ -0,0 +1,4 @@ +[requires] +build = ["pkgconfig(libzstd)"] +lib = ["pkgconfig(libzstd)"] + diff --git a/SOURCES/zstd-sys-fix-metadata-auto.diff b/SOURCES/zstd-sys-fix-metadata-auto.diff new file mode 100644 index 0000000..8e7545c --- /dev/null +++ b/SOURCES/zstd-sys-fix-metadata-auto.diff @@ -0,0 +1,16 @@ +--- zstd-sys-2.0.9+zstd.1.5.5/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ zstd-sys-2.0.9+zstd.1.5.5/Cargo.toml 2024-01-15T14:42:57.236818+00:00 +@@ -13,7 +13,7 @@ + edition = "2018" + rust-version = "1.64" + name = "zstd-sys" +-version = "2.0.9+zstd.1.5.5" ++version = "2.0.9" + authors = ["Alexandre Bury "] + build = "build.rs" + links = "zstd" +@@ -83,3 +83,4 @@ + thin-lto = [] + zdict_builder = [] + zstdmt = [] ++ diff --git a/SOURCES/zstd-sys-fix-metadata.diff b/SOURCES/zstd-sys-fix-metadata.diff index dc57351..d8499d2 100644 --- a/SOURCES/zstd-sys-fix-metadata.diff +++ b/SOURCES/zstd-sys-fix-metadata.diff @@ -1,17 +1,14 @@ ---- zstd-sys-2.0.8+zstd.1.5.5/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ zstd-sys-2.0.8+zstd.1.5.5/Cargo.toml 2023-08-01T13:04:14.123960+00:00 -@@ -13,20 +13,15 @@ - edition = "2018" - rust-version = "1.43" - name = "zstd-sys" --version = "2.0.8+zstd.1.5.5" -+version = "2.0.8" +--- zstd-sys-2.0.9+zstd.1.5.5/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ zstd-sys-2.0.9+zstd.1.5.5/Cargo.toml 2024-01-15T14:43:55.623033+00:00 +@@ -17,18 +17,11 @@ authors = ["Alexandre Bury "] build = "build.rs" links = "zstd" -include = [ -- "/LICENSE", -- "/*.*", +- "/LICENSE*", +- "!/*.sh", +- "/build.rs", +- "/*.h", - "/src/", - "/wasm-shim/**/*.h", - "/zstd/LICENSE", @@ -27,13 +24,7 @@ ] description = "Low-level bindings for the zstd compression library." readme = "Readme.md" -@@ -52,12 +47,11 @@ - version = "0.2.45" - - [build-dependencies.bindgen] --version = "0.64" -+version = "0.63" - features = [ +@@ -56,7 +49,6 @@ "runtime", "which-rustfmt", ] @@ -41,7 +32,7 @@ default-features = false [build-dependencies.cc] -@@ -68,6 +62,7 @@ +@@ -67,6 +59,7 @@ version = "0.3" [features] diff --git a/SPECS/rust-zstd-sys.spec b/SPECS/rust-zstd-sys.spec index ab070d3..3be3d82 100644 --- a/SPECS/rust-zstd-sys.spec +++ b/SPECS/rust-zstd-sys.spec @@ -1,5 +1,5 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.3.5) +## (rpmautospec version 0.5.1) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: release_number = 1; @@ -8,15 +8,15 @@ }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec -# Generated by rust2rpm 24 +# Generated by rust2rpm 25 %bcond_without check %global debug_package %{nil} %global crate zstd-sys -%global upstream_version 2.0.8+zstd.1.5.5 +%global upstream_version 2.0.9+zstd.1.5.5 Name: rust-zstd-sys -Version: 2.0.8 +Version: 2.0.9 Release: %autorelease Summary: Low-level bindings for the zstd compression library @@ -24,8 +24,9 @@ Summary: Low-level bindings for the zstd compression library License: MIT OR Apache-2.0 URL: https://crates.io/crates/zstd-sys Source: %{crates_source %{crate} %{upstream_version}} +# Automatically generated patch to strip dependencies and normalize metadata +Patch: zstd-sys-fix-metadata-auto.diff # Manually created patch for downstream crate metadata changes -# * remove zstd version from version field # * make bindgen build-dependency non-optional # * temporarily downgrade bindgen build-dependency from 0.64 to 0.63 # * fix logic for included / excluded files @@ -34,7 +35,7 @@ Patch: zstd-sys-fix-metadata.diff # * unconditionally use bindgen and pkg-config to link against system libzstd Patch: 0001-unconditionally-use-bindgen-and-pkg-config-to-link-a.patch -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Low-level bindings for the zstd compression library.} @@ -228,9 +229,9 @@ use the "zstdmt" feature of the "%{crate}" crate. %prep %autosetup -n %{crate}-%{upstream_version} -p1 +%cargo_prep # * remove bundled zstd sources rm -vr zstd/ -%cargo_prep %generate_buildrequires %cargo_generate_buildrequires @@ -248,9 +249,13 @@ echo 'pkgconfig(libzstd)' %endif %changelog -* Mon Jan 15 2024 Arkady L. Shane - 2.0.8-1 +## START: Generated by rpmautospec +* Mon Jan 15 2024 Arkady L. Shane - 2.0.9-1 - Rebuilt for MSVSphere 9.3 +* Mon Jan 15 2024 Fabio Valentini - 2.0.9-1 +- Update to version 2.0.9+zstd.1.5.5; Fixes RHBZ#2243313 + * Tue Aug 01 2023 Fabio Valentini - 2.0.8-1 - Update to version 2.0.8+zstd.1.5.5; Fixes RHBZ#2184801 @@ -317,3 +322,4 @@ echo 'pkgconfig(libzstd)' * Sun Dec 15 23:59:34 CET 2019 Robert-André Mauchin - 1.4.15-1 - Initial package +## END: Generated by rpmautospec