rpms
/
rust-zstd-sys
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:epel9
Branches Tags
rpms:i10ce
rpms:epel10
rpms:i9ce
rpms:epel9
...
pull from: rpms:i10ce
Branches Tags
rpms:i10ce
rpms:epel10
rpms:i9ce
rpms:epel9

No commits in common. 'epel9' and 'i10ce' have entirely different histories.
epel9 ... i10ce

10 changed files with 154 additions and 78 deletions
Show Stats

13
.gitignore vendored
Unescape View File

@ -1,12 +1 @@
/zstd-sys-1.4.15+zstd.1.4.4.crate
/zstd-sys-1.4.16+zstd.1.4.5.crate
/zstd-sys-1.4.17+zstd.1.4.5.crate
/zstd-sys-1.4.20+zstd.1.4.9.crate
/zstd-sys-1.5.0+zstd.1.4.9.crate
/zstd-sys-1.6.1+zstd.1.5.0.crate
/zstd-sys-1.6.2+zstd.1.5.1.crate
/zstd-sys-1.6.3+zstd.1.5.2.crate
/zstd-sys-2.0.1+zstd.1.5.2.crate
/zstd-sys-2.0.7+zstd.1.5.4.crate
/zstd-sys-2.0.8+zstd.1.5.5.crate
/zstd-sys-2.0.9+zstd.1.5.5.crate
SOURCES/zstd-sys-2.0.13+zstd.1.5.6.crate

1
.rust-zstd-sys.metadata
Unescape View File

@ -0,0 +1 @@
cc314995634c855abadb6b3f0cd3bba8598e76cc SOURCES/zstd-sys-2.0.13+zstd.1.5.6.crate

24
0001-unconditionally-use-bindgen-and-pkg-config-to-link-a.patch → SOURCES/0001-unconditionally-use-bindgen-and-pkg-config-to-link-a.patch
Unescape View File

@ -1,6 +1,6 @@
From 94271fbfcdafac911bfa9ec7bdfee7c33f6423c4 Mon Sep 17 00:00:00 2001
From 2fff0a56e8508e5c024bd2b0312cedae7da324f4 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe@gmail.com>
Date: Tue, 1 Aug 2023 15:13:34 +0200
Date: Mon, 7 Oct 2024 18:22:28 +0200
Subject: [PATCH] unconditionally use bindgen and pkg-config to link against
system libzstd
@ -9,7 +9,7 @@ Subject: [PATCH] unconditionally use bindgen and pkg-config to link against
1 file changed, 3 insertions(+), 207 deletions(-)
diff --git a/build.rs b/build.rs
index a77a10e..e748b4b 100644
index e578f60..2274c45 100644
--- a/build.rs
+++ b/build.rs
@@ -1,8 +1,6 @@
@ -23,7 +23,7 @@ index a77a10e..e748b4b 100644
fn generate_bindings(defs: Vec<&str>, headerpaths: Vec<PathBuf>) {
let bindings = bindgen::Builder::default().header("zstd.h");
#[cfg(feature = "zdict_builder")]
@@ -35,9 +33,6 @@ fn generate_bindings(defs: Vec<&str>, headerpaths: Vec<PathBuf>) {
@@ -36,9 +34,6 @@ fn generate_bindings(defs: Vec<&str>, headerpaths: Vec<PathBuf>) {
.expect("Could not write bindings");
}
@ -33,7 +33,7 @@ index a77a10e..e748b4b 100644
fn pkg_config() -> (Vec<&'static str>, Vec<PathBuf>) {
let library = pkg_config::Config::new()
.statik(true)
@@ -47,31 +42,6 @@ fn pkg_config() -> (Vec<&'static str>, Vec<PathBuf>) {
@@ -48,31 +43,6 @@ fn pkg_config() -> (Vec<&'static str>, Vec<PathBuf>) {
(vec!["PKG_CONFIG"], library.include_paths)
}
@ -65,7 +65,7 @@ index a77a10e..e748b4b 100644
/// This function would find the first flag in `flags` that is supported
/// and add that to `config`.
#[allow(dead_code)]
@@ -85,156 +55,6 @@ fn flag_if_supported_with_fallbacks(config: &mut cc::Build, flags: &[&str]) {
@@ -86,156 +56,6 @@ fn flag_if_supported_with_fallbacks(config: &mut cc::Build, flags: &[&str]) {
}
}
@ -116,16 +116,16 @@ index a77a10e..e748b4b 100644
- // Note that Emscripten already provides its own C standard library so
- // wasm32-unknown-emscripten should not be included here.
- // See: https://github.com/gyscos/zstd-rs/pull/209
- let need_wasm_shim = env::var("TARGET").map_or(false, |target| {
- target == "wasm32-unknown-unknown" || target == "wasm32-wasi"
- });
- let need_wasm_shim = !cfg!(feature = "no_wasm_shim")
- && env::var("TARGET").map_or(false, |target| {
- target == "wasm32-unknown-unknown" || target.starts_with("wasm32-wasi")
- });
-
- if need_wasm_shim {
- cargo_print(&"rerun-if-changed=wasm-shim/stdlib.h");
- cargo_print(&"rerun-if-changed=wasm-shim/string.h");
-
- config.include("wasm-shim/");
- config.define("XXH_STATIC_ASSERT", Some("0"));
- }
-
- // Some extra parameters
@ -222,7 +222,7 @@ index a77a10e..e748b4b 100644
/// Print a line for cargo.
///
/// If non-cargo is set, do not print anything.
@@ -247,32 +67,8 @@ fn cargo_print(content: &dyn fmt::Display) {
@@ -248,32 +68,8 @@ fn cargo_print(content: &dyn fmt::Display) {
fn main() {
cargo_print(&"rerun-if-env-changed=ZSTD_SYS_USE_PKG_CONFIG");
@ -257,5 +257,5 @@ index a77a10e..e748b4b 100644
let includes: Vec<_> = headerpaths
.iter()
--
2.41.0
2.46.2

29
SOURCES/rust2rpm.toml
Unescape View File

@ -0,0 +1,29 @@
[package]
cargo-toml-patch-comments = [
"make bindgen build-dependency non-optional",
"fix logic for included / excluded files",
"exclude files that are only useful for upstream development",
]
[[package.extra-patches]]
number = 10
file = "0001-unconditionally-use-bindgen-and-pkg-config-to-link-a.patch"
comments = [
"unconditionally use bindgen and pkg-config to link against system libzstd",
]
[features]
hide = [
"no_wasm_shim",
]
[requires]
build = ["pkgconfig(libzstd)"]
lib = ["pkgconfig(libzstd)"]
[scripts]
prep.post = [
"# * remove bundled zstd sources",
"rm -vr zstd/",
]

10
zstd-sys-fix-metadata-auto.diff → SOURCES/zstd-sys-fix-metadata-auto.diff
Unescape View File

@ -1,15 +1,15 @@
--- 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
--- zstd-sys-2.0.13+zstd.1.5.6/Cargo.toml 1970-01-01T00:00:01+00:00
+++ zstd-sys-2.0.13+zstd.1.5.6/Cargo.toml 2024-10-07T16:19:06.513584+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"
-version = "2.0.13+zstd.1.5.6"
+version = "2.0.13"
authors = ["Alexandre Bury <alexandre.bury@gmail.com>"]
build = "build.rs"
links = "zstd"
@@ -83,3 +83,4 @@
@@ -84,3 +84,4 @@
thin-lto = []
zdict_builder = []
zstdmt = []

4
zstd-sys-fix-metadata.diff → SOURCES/zstd-sys-fix-metadata.diff
Unescape View File

@ -1,5 +1,5 @@
--- 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
--- zstd-sys-2.0.13+zstd.1.5.6/Cargo.toml 1970-01-01T00:00:01+00:00
+++ zstd-sys-2.0.13+zstd.1.5.6/Cargo.toml 2024-10-07T16:19:32.884735+00:00
@@ -17,18 +17,11 @@
authors = ["Alexandre Bury <alexandre.bury@gmail.com>"]
build = "build.rs"

111
rust-zstd-sys.spec → SPECS/rust-zstd-sys.spec
Unescape View File

@ -1,12 +1,22 @@
# Generated by rust2rpm 25
## START: Set by rpmautospec
## (rpmautospec version 0.7.2)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 1;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
# Generated by rust2rpm 26
%bcond_without check
%global debug_package %{nil}
%global crate zstd-sys
%global upstream_version 2.0.9+zstd.1.5.5
%global upstream_version 2.0.13+zstd.1.5.6
Name: rust-zstd-sys
Version: 2.0.9
Version: 2.0.13
Release: %autorelease
Summary: Low-level bindings for the zstd compression library
@ -18,14 +28,14 @@ Source: %{crates_source %{crate} %{upstream_version}}
Patch: zstd-sys-fix-metadata-auto.diff
# Manually created patch for downstream crate metadata changes
# * make bindgen build-dependency non-optional
# * temporarily downgrade bindgen build-dependency from 0.64 to 0.63
# * fix logic for included / excluded files
# * exclude files that are only useful for upstream development
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
Patch10: 0001-unconditionally-use-bindgen-and-pkg-config-to-link-a.patch
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: pkgconfig(libzstd)
%global _description %{expand:
Low-level bindings for the zstd compression library.}
@ -225,7 +235,6 @@ rm -vr zstd/
%generate_buildrequires
%cargo_generate_buildrequires
echo 'pkgconfig(libzstd)'
%build
%cargo_build
@ -239,4 +248,92 @@ echo 'pkgconfig(libzstd)'
%endif
%changelog
%autochangelog
* Fri Dec 20 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.0.13-1
- Rebuilt for MSVSphere 10
## START: Generated by rpmautospec
* Mon Oct 07 2024 Fabio Valentini <decathorpe@gmail.com> - 2.0.13-1
- Update to version 2.0.13+zstd.1.5.6; Fixes RHBZ#2302536
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sun Jul 07 2024 Fabio Valentini <decathorpe@gmail.com> - 2.0.12-1
- Update to version 2.0.12+zstd.1.5.6; Fixes RHBZ#2292666
* Thu May 16 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 2.0.10-1
- Update to version 2.0.10; Fixes RHBZ#2271895
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 15 2024 Fabio Valentini <decathorpe@gmail.com> - 2.0.9-1
- Update to version 2.0.9+zstd.1.5.5; Fixes RHBZ#2243313
* Tue Aug 01 2023 Fabio Valentini <decathorpe@gmail.com> - 2.0.8-1
- Update to version 2.0.8+zstd.1.5.5; Fixes RHBZ#2184801
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Feb 23 2023 Fabio Valentini <decathorpe@gmail.com> - 2.0.7-1
- Update to version 2.0.7+zstd.1.5.4; Fixes RHBZ#2145250
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Aug 06 2022 Fabio Valentini <decathorpe@gmail.com> - 2.0.1-1
- Update to version 2.0.1+zstd.1.5.2; Fixes RHBZ#2043687
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Apr 12 2022 Fabio Valentini <decathorpe@gmail.com> - 1.6.3-1
- Update to version 1.6.3+zstd.1.5.2
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jan 07 2022 Fabio Valentini <decathorpe@gmail.com> - 1.6.2-1
- Update to version 1.6.2+zstd.1.5.1; Fixes RHBZ#2035404
* Sat Nov 13 2021 Robert-André Mauchin <zebob.m@gmail.com> - 1.6.1-1
- Update to 1.6.1 Close: rhbz#1960714
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 10 2021 Fabio Valentini <decathorpe@gmail.com> - 1.5.0-1
- Update to version 1.5.0+zstd.1.4.9.
* Wed Mar 31 21:35:34 CEST 2021 Robert-André Mauchin <zebob.m@gmail.com> - 1.4.20-2
- Remove downgrade of bindgen to 0.56
* Sat Mar 06 2021 Fabio Valentini <decathorpe@gmail.com> - 1.4.20-1
- Update to version 1.4.20+zstd.1.4.9.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.17-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Nov 27 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.17-3
- Bump to bindgen 0.56.
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jun 19 2020 Josh Stone <jistone@redhat.com> - 1.4.17-1
- Update to 1.4.17+zstd.1.4.5
* Sat May 30 2020 Josh Stone <jistone@redhat.com> - 1.4.16-1
- Update to 1.4.16+zstd.1.4.5
* Thu Feb 27 2020 Josh Stone <jistone@redhat.com> - 1.4.15-3
- Bump to bindgen 0.53.1
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Dec 15 23:59:34 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 1.4.15-1
- Initial package
## END: Generated by rpmautospec

35
changelog
Unescape View File

@ -1,35 +0,0 @@
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 10 2021 Fabio Valentini <decathorpe@gmail.com> - 1.5.0-1
- Update to version 1.5.0+zstd.1.4.9.
* Wed Mar 31 21:35:34 CEST 2021 Robert-André Mauchin <zebob.m@gmail.com> - 1.4.20-2
- Remove downgrade of bindgen to 0.56
* Sat Mar 06 2021 Fabio Valentini <decathorpe@gmail.com> - 1.4.20-1
- Update to version 1.4.20+zstd.1.4.9.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.17-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Nov 27 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.17-3
- Bump to bindgen 0.56.
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.17-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jun 19 2020 Josh Stone <jistone@redhat.com> - 1.4.17-1
- Update to 1.4.17+zstd.1.4.5
* Sat May 30 2020 Josh Stone <jistone@redhat.com> - 1.4.16-1
- Update to 1.4.16+zstd.1.4.5
* Thu Feb 27 2020 Josh Stone <jistone@redhat.com> - 1.4.15-3
- Bump to bindgen 0.53.1
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Dec 15 23:59:34 CET 2019 Robert-André Mauchin <zebob.m@gmail.com> - 1.4.15-1
- Initial package

4
rust2rpm.toml
Unescape View File

@ -1,4 +0,0 @@
[requires]
build = ["pkgconfig(libzstd)"]
lib = ["pkgconfig(libzstd)"]

1
sources
Unescape View File

@ -1 +0,0 @@
SHA512 (zstd-sys-2.0.9+zstd.1.5.5.crate) = 604c01eae4975745aca1dc1d351db98fec34f7036143e59dfeb4d36e6ee18ac9f3871a288557c8ebdc9e816967a008da43154dc9a0eb3cac85071ccb05bf58aa
Write Preview
Loading…
Cancel
Save