Architecture specific change in rpms/rust-libbpf-cargo.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-libbpf-cargo.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-libbpf-cargo.git/commit/?id=....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 69c05e5ed2f867d13f7e0832ca7a0f64c69b6d53
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Fri Jan 27 12:52:55 2023 -0600
Remove unused patch
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/libbpf-cargo-downgrade-libbpf-sys.patch b/libbpf-cargo-downgrade-libbpf-sys.patch
deleted file mode 100644
index c486c23..0000000
--- a/libbpf-cargo-downgrade-libbpf-sys.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/Cargo.toml b/Cargo.toml
---- a/Cargo.toml 2021-11-11 07:46:13.666336171 -0800
-+++ b/Cargo.toml 2021-11-11 07:46:29.139418018 -0800
-@@ -35,7 +35,7 @@
- version = "0.12"
-
- [dependencies.libbpf-sys]
--version = "0.5.0-2"
-+version = "0.4.0-2"
-
- [dependencies.memmap2]
- version = "0.3"
commit ee82f0c977ddac853b69d8d983e492795a4b8cd8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 23:42:09 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit fdcfa65e0607c2330f690b4125fed881bcdef5c2
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Tue Jan 17 15:49:50 2023 -0600
Update to 0.13.1
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index f691761..da329d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/libbpf-cargo-0.9.3.crate
/libbpf-cargo-0.10.0.crate
+/libbpf-cargo-0.13.1.crate
diff --git a/libbpf-cargo-fix-finding-libbpf-rs.diff b/libbpf-cargo-fix-finding-libbpf-rs.diff
new file mode 100644
index 0000000..f49e617
--- /dev/null
+++ b/libbpf-cargo-fix-finding-libbpf-rs.diff
@@ -0,0 +1,15 @@
+Find libbpf-rs in /usr/share/cargo/registry, not in the local checkout
+--- a/src/test.rs
++++ b/src/test.rs
+@@ -103,10 +103,7 @@ fn validate_bpf_o(path: &Path) {
+ fn get_libbpf_rs_path() -> PathBuf {
+ let cwd = std::env::current_dir().expect("failed to get cwd");
+
+- Path::new(&cwd)
+- .parent()
+- .expect("failed to get parent of cwd")
+- .join("libbpf-rs")
++ Path::new("/usr/share/cargo/registry/libbpf-rs-0.19.1")
+ .canonicalize()
+ .expect("failed to canonicalize libbpf-rs")
+ }
diff --git a/libbpf-cargo-fix-finding-libbpf-rs.patch b/libbpf-cargo-fix-finding-libbpf-rs.patch
deleted file mode 100644
index c1e2627..0000000
--- a/libbpf-cargo-fix-finding-libbpf-rs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff '--color=auto' -ruN libbpf-cargo-0.10.0/src/test.rs libbpf-cargo-0.10.0-fix-finding-libbpf-rs/src/test.rs
---- libbpf-cargo-0.10.0/src/test.rs 1973-11-29 13:33:09.000000000 -0800
-+++ libbpf-cargo-0.10.0-fix-finding-libbpf-rs/src/test.rs 2022-02-16 15:36:05.637528820 -0800
-@@ -102,10 +102,7 @@
- fn get_libbpf_rs_path() -> PathBuf {
- let cwd = std::env::current_dir().expect("failed to get cwd");
-
-- Path::new(&cwd)
-- .parent()
-- .expect("failed to get parent of cwd")
-- .join("libbpf-rs")
-+ Path::new("/usr/share/cargo/registry/libbpf-rs-0.16.0")
- .canonicalize()
- .expect("failed to canonicalize libbpf-rs")
- }
diff --git a/libbpf-cargo-fix-metadata.diff b/libbpf-cargo-fix-metadata.diff
index 2759ff9..9caee74 100644
--- a/libbpf-cargo-fix-metadata.diff
+++ b/libbpf-cargo-fix-metadata.diff
@@ -1,23 +1,19 @@
---- libbpf-cargo-0.10.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ libbpf-cargo-0.10.0/Cargo.toml 2022-07-22T12:16:13.899028+00:00
-@@ -47,10 +47,10 @@
- version = "1.5"
-
- [dependencies.scroll]
--version = "0.10"
-+version = "0.11"
+--- libbpf-cargo-0.13.1/Cargo.toml 1970-01-01T00:00:01+00:00
++++ libbpf-cargo-0.13.1/Cargo.toml 2022-12-12T18:44:06.726590+00:00
+@@ -32,7 +32,7 @@
+ version = "1.0"
- [dependencies.scroll_derive]
--version = "0.10"
-+version = "0.11"
+ [dependencies.cargo_metadata]
+-version = "0.14"
++version = "0.15"
- [dependencies.semver]
- version = "1.0"
-@@ -71,9 +71,10 @@
+ [dependencies.clap]
+ version = "3.1"
+@@ -73,9 +73,10 @@
[dependencies.thiserror]
version = "1.0"
[dev-dependencies.goblin]
--version = "0.2"
+-version = "0.4"
+version = "0.5"
[features]
diff --git a/rust-libbpf-cargo.spec b/rust-libbpf-cargo.spec
index 36d0b6f..ebb6cc0 100644
--- a/rust-libbpf-cargo.spec
+++ b/rust-libbpf-cargo.spec
@@ -1,28 +1,26 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 23
%bcond_without check
%global crate libbpf-cargo
-Name: rust-%{crate}
-Version: 0.10.0
+Name: rust-libbpf-cargo
+Version: 0.13.1
Release: %autorelease
Summary: Cargo plugin to build bpf programs
-# Upstream license specification: LGPL-2.1 OR BSD-2-Clause
-License: LGPLv2 or BSD
+License: LGPL-2.1 OR BSD-2-Clause
URL: https://crates.io/crates/libbpf-cargo
Source: %{crates_source}
-# * turn on the novendor feature by default
-# * bump scroll and scroll_derive from 0.10 to 0.11,
-# * bump goblin from 0.2 to 0.5:
-# https://github.com/libbpf/libbpf-rs/commit/56608e0
-Patch0: libbpf-cargo-fix-metadata.diff
-# Fix finding libbpf-rs
-Patch1: libbpf-cargo-fix-finding-libbpf-rs.patch
+# Manually created patch for downstream crate metadata changes
+# - bump cargo_metadata to 0.15
+# - bump goblin to 0.5
+# - use libbpf-sys/novendor by default
+Patch: libbpf-cargo-fix-metadata.diff
+# by default, test.rs expects libbpf-rs to be in the same checkout
+# fix to point to /usr/share/cargo/registry
+Patch: libbpf-cargo-fix-finding-libbpf-rs.diff
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Cargo plugin to build bpf programs.}
@@ -35,7 +33,9 @@ Summary: %{summary}
%description -n %{crate} %{_description}
%files -n %{crate}
-%license LICENSE LICENSE.BSD-2-Clause LICENSE.LPGL-2.1
+%license LICENSE
+%license LICENSE.BSD-2-Clause
+%license LICENSE.LPGL-2.1
%doc README.md
%{_bindir}/cargo-libbpf
@@ -51,9 +51,11 @@ This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
-%license LICENSE LICENSE.BSD-2-Clause LICENSE.LPGL-2.1
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%license %{crate_instdir}/LICENSE.BSD-2-Clause
+%license %{crate_instdir}/LICENSE.LPGL-2.1
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -65,7 +67,7 @@ This package contains library source intended for building other packages which
use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+novendor-devel
Summary: %{summary}
@@ -77,25 +79,18 @@ This package contains library source intended for building other packages which
use the "novendor" feature of the "%{crate}" crate.
%files -n %{name}+novendor-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
-%if 0%{?fedora} < 36
-sed -i -e 's/version = "0.6.0-1"/version = "0.4.0-2"/' Cargo.toml
-%else
-%if 0%{?fc36}
-sed -i -e 's/version = "0.6.0-1"/version = "0.5.0-2"/' Cargo.toml
-%else
-sed -i -e 's/version = "0.6.0-1"/version = "0.6.1-2"/' Cargo.toml
-%endif
-%endif
%cargo_prep
%generate_buildrequires
%cargo_generate_buildrequires
echo 'clang'
-echo 'rust-libbpf-rs-devel'
+# this was dropped from Cargo.toml upstream with the expectation that
+# libbpf-rs is built from the same Git checkout
+echo 'crate(libbpf-rs) = 0.19.1'
echo 'rustfmt'
%build
diff --git a/.rust2rpm.conf b/rust2rpm.conf
similarity index 100%
rename from .rust2rpm.conf
rename to rust2rpm.conf
diff --git a/sources b/sources
index d440e81..25b68f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libbpf-cargo-0.10.0.crate) = 60533b247928b0d1c3d8136abedb1d0309d69bf96bf4b95a122082295a1da6af0ff73a44fd3498979990d002f33a1ff8152df46b58167c5278fc6ce4bdf5ac0c
+SHA512 (libbpf-cargo-0.13.1.crate) = 5c43b2d751f9d73100db2659c0f9693bf86ce06d84cda285c75f436a46116756bbbd338c795dfdb235f9081e8f1ced237d007fbbb8f50ecdadc9485ccbf85040
10 months, 1 week
Architecture specific change in rpms/rust-libbpf-sys.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-libbpf-sys.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-libbpf-sys.git/commit/?id=ca....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit f592dca76f3e15a1ea634e182ef1e3f91bbcc78b
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Fri Jan 27 12:38:20 2023 -0600
Switch back to vendored libbpf, as the system one is too old
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/libbpf-sys-fix-metadata.diff b/libbpf-sys-fix-metadata.diff
index 3b33bb2..daea48d 100644
--- a/libbpf-sys-fix-metadata.diff
+++ b/libbpf-sys-fix-metadata.diff
@@ -18,11 +18,3 @@
optional = true
[build-dependencies.cc]
-@@ -48,6 +48,7 @@
- version = "0.3"
-
- [features]
-+default = ["novendor"]
- novendor = []
- static = []
-
diff --git a/rust-libbpf-sys.spec b/rust-libbpf-sys.spec
index c535c1b..54d7092 100644
--- a/rust-libbpf-sys.spec
+++ b/rust-libbpf-sys.spec
@@ -15,12 +15,14 @@ URL: https://crates.io/crates/libbpf-sys
Source: %{crates_source %{crate} %{upstream_version}}
# Manually created patch for downstream crate metadata changes
# * remove version suffix from crate version
-# * default to novendor
# * bump bindgen to 0.63
Patch: libbpf-sys-fix-metadata.diff
BuildRequires: rust-packaging >= 21
+# the system libbpf is too old, use the bundled copy
+Provides: bundled(libbpf) = 1.0.1
+
%global _description %{expand:
Rust bindings to libbpf from the Linux kernel.}
@@ -94,15 +96,12 @@ use the "static" feature of the "%{crate}" crate.
%prep
%autosetup -n %{crate}-%{upstream_version} -p1
-# Remove bundled libbpf
-rm -r libbpf
%cargo_prep
%generate_buildrequires
%cargo_generate_buildrequires
echo 'elfutils-libelf-devel'
echo 'kernel-headers'
-echo 'libbpf-devel'
echo 'zlib-devel'
%build
commit 48ff72b9448fd1b0ef616754e8fc9cbefde3d258
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Jan 18 22:20:41 2023 -0600
Fix FTI for bindgen feature by bumping the bindgen requirement to 0.63
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/libbpf-sys-fix-metadata.diff b/libbpf-sys-fix-metadata.diff
index 2623ebb..3b33bb2 100644
--- a/libbpf-sys-fix-metadata.diff
+++ b/libbpf-sys-fix-metadata.diff
@@ -1,5 +1,5 @@
--- libbpf-sys-1.0.4+v1.0.1/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ libbpf-sys-1.0.4+v1.0.1/Cargo.toml 2022-12-08T22:58:56.104613+00:00
++++ libbpf-sys-1.0.4+v1.0.1/Cargo.toml 2023-01-19T04:19:55.090748+00:00
@@ -12,7 +12,7 @@
[package]
edition = "2018"
@@ -9,6 +9,15 @@
authors = [
"Alex Forster <alex(a)alexforster.com>",
"Dan Siemon <dan(a)coverfire.com>",
+@@ -38,7 +38,7 @@
+ ]
+
+ [build-dependencies.bindgen]
+-version = "^0.60"
++version = "^0.63"
+ optional = true
+
+ [build-dependencies.cc]
@@ -48,6 +48,7 @@
version = "0.3"
diff --git a/rust-libbpf-sys.spec b/rust-libbpf-sys.spec
index d394660..c535c1b 100644
--- a/rust-libbpf-sys.spec
+++ b/rust-libbpf-sys.spec
@@ -16,6 +16,7 @@ Source: %{crates_source %{crate} %{upstream_version}}
# Manually created patch for downstream crate metadata changes
# * remove version suffix from crate version
# * default to novendor
+# * bump bindgen to 0.63
Patch: libbpf-sys-fix-metadata.diff
BuildRequires: rust-packaging >= 21
commit 2023c179b2d9324436ef2d2adbd10ae03ecc7e4f
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Fri Dec 9 16:24:10 2022 -0600
Restore the removal of the bundled libbpf
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/rust-libbpf-sys.spec b/rust-libbpf-sys.spec
index 445f7e1..d394660 100644
--- a/rust-libbpf-sys.spec
+++ b/rust-libbpf-sys.spec
@@ -40,9 +40,6 @@ use the "%{crate}" crate.
%files devel
%license %{crate_instdir}/LICENSE
-%license %{crate_instdir}/libbpf/LICENSE
-%license %{crate_instdir}/libbpf/LICENSE.BSD-2-Clause
-%license %{crate_instdir}/libbpf/LICENSE.LGPL-2.1
%doc %{crate_instdir}/README.md
%{crate_instdir}/
@@ -96,6 +93,8 @@ use the "static" feature of the "%{crate}" crate.
%prep
%autosetup -n %{crate}-%{upstream_version} -p1
+# Remove bundled libbpf
+rm -r libbpf
%cargo_prep
%generate_buildrequires
commit cab0fce01664dc28b903c62c4cd2a31a69ab14f9
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Thu Dec 8 16:33:58 2022 -0600
Update to 1.0.4
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index a837eee..f457728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libbpf-sys-0.6.1-2.crate
+/libbpf-sys-1.0.4+v1.0.1.crate
diff --git a/libbpf-sys-fix-metadata.diff b/libbpf-sys-fix-metadata.diff
index 2f61d64..2623ebb 100644
--- a/libbpf-sys-fix-metadata.diff
+++ b/libbpf-sys-fix-metadata.diff
@@ -1,10 +1,19 @@
---- libbpf-sys-0.6.1-2/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ libbpf-sys-0.6.1-2/Cargo.toml 2022-02-10T23:20:20.526559+00:00
-@@ -32,6 +32,7 @@
+--- libbpf-sys-1.0.4+v1.0.1/Cargo.toml 1970-01-01T00:00:01+00:00
++++ libbpf-sys-1.0.4+v1.0.1/Cargo.toml 2022-12-08T22:58:56.104613+00:00
+@@ -12,7 +12,7 @@
+ [package]
+ edition = "2018"
+ name = "libbpf-sys"
+-version = "1.0.4+v1.0.1"
++version = "1.0.4"
+ authors = [
+ "Alex Forster <alex(a)alexforster.com>",
+ "Dan Siemon <dan(a)coverfire.com>",
+@@ -48,6 +48,7 @@
version = "0.3"
[features]
+default = ["novendor"]
novendor = []
- [badges.maintenance]
- status = "passively-maintained"
+ static = []
+
diff --git a/rust-libbpf-sys.spec b/rust-libbpf-sys.spec
index 0a3ad25..445f7e1 100644
--- a/rust-libbpf-sys.spec
+++ b/rust-libbpf-sys.spec
@@ -1,24 +1,24 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 23
%bcond_without check
%global debug_package %{nil}
%global crate libbpf-sys
+%global upstream_version 1.0.4+v1.0.1
-Name: rust-%{crate}
-Version: 0.6.1~2
+Name: rust-libbpf-sys
+Version: 1.0.4
Release: %autorelease
Summary: Rust bindings to libbpf from the Linux kernel
-# Upstream license specification: BSD-2-Clause
-License: BSD
+License: BSD-2-Clause
URL: https://crates.io/crates/libbpf-sys
-Source: %{crates_source}
-# Turn on the novendor feature by default
-Patch0: libbpf-sys-fix-metadata.diff
+Source: %{crates_source %{crate} %{upstream_version}}
+# Manually created patch for downstream crate metadata changes
+# * remove version suffix from crate version
+# * default to novendor
+Patch: libbpf-sys-fix-metadata.diff
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Rust bindings to libbpf from the Linux kernel.}
@@ -39,9 +39,12 @@ This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
-%license LICENSE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%license %{crate_instdir}/libbpf/LICENSE
+%license %{crate_instdir}/libbpf/LICENSE.BSD-2-Clause
+%license %{crate_instdir}/libbpf/LICENSE.LGPL-2.1
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -53,7 +56,19 @@ This package contains library source intended for building other packages which
use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+bindgen-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+bindgen-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "bindgen" feature of the "%{crate}" crate.
+
+%files -n %{name}+bindgen-devel
+%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+novendor-devel
Summary: %{summary}
@@ -65,12 +80,22 @@ This package contains library source intended for building other packages which
use the "novendor" feature of the "%{crate}" crate.
%files -n %{name}+novendor-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
+
+%package -n %{name}+static-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+static-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "static" feature of the "%{crate}" crate.
+
+%files -n %{name}+static-devel
+%ghost %{crate_instdir}/Cargo.toml
%prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-# Remove bundled libbpf
-rm -r libbpf
+%autosetup -n %{crate}-%{upstream_version} -p1
%cargo_prep
%generate_buildrequires
diff --git a/.rust2rpm.conf b/rust2rpm.conf
similarity index 100%
rename from .rust2rpm.conf
rename to rust2rpm.conf
diff --git a/sources b/sources
index ed94907..79bf73b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libbpf-sys-0.6.1-2.crate) = ce5bc7341d576181ae4350c5516bb3d9d3f611e673ee6586c876380b62389007d0b9f225bc94f20550b4b96ae108ee281197cb9db67737e1432417aee6f0e809
+SHA512 (libbpf-sys-1.0.4+v1.0.1.crate) = 9a8ac5eb85afcd6bd51f2992c73a4f5dd08fbab995a958929d058f35555112a8832665e749a00729da766e8364d442e3ad32064c0a526ee5da778eb25206319f
10 months, 1 week
Architecture specific change in rpms/rust-below-dump.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-below-dump.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-below-dump.git/commit/?id=cd...
https://src.fedoraproject.org/cgit/rpms/rust-below-dump.git/commit/?id=07....
Change:
+ExcludeArch: %{arm32} %{ix86}
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit cd935d3f39e91613b38c9d4dd02a4deb777fcba1
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Sat Jan 28 23:14:33 2023 -0600
Also exclude builds on 32-bit ARM architectures
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/rust-below-dump.spec b/rust-below-dump.spec
index e30adcf..5940d7b 100644
--- a/rust-below-dump.spec
+++ b/rust-below-dump.spec
@@ -18,7 +18,7 @@ Source: %{crates_source}
Patch: below-dump-fix-metadata.diff
# below-btrfs and below-model are not available
-ExcludeArch: %{ix86}
+ExcludeArch: %{arm32} %{ix86}
BuildRequires: rust-packaging >= 21
commit 8c49c214383e2dc3783379618fb774482bd3786a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 21:43:40 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit 073d2cd9eb8f794e5769b15b8bd0d459f65979d2
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Thu Jan 19 22:03:43 2023 -0600
Update to 0.6.3
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index a2c505d..3cade72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/below-dump-0.4.1.crate
/below-dump-0.5.0.crate
+/below-dump-0.6.3.crate
diff --git a/below-dump-fix-metadata.diff b/below-dump-fix-metadata.diff
index 4e42e22..7be647e 100644
--- a/below-dump-fix-metadata.diff
+++ b/below-dump-fix-metadata.diff
@@ -1,10 +1,23 @@
---- below-dump-0.5.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ below-dump-0.5.0/Cargo.toml 2022-06-01T14:57:15.529921+00:00
-@@ -57,6 +57,6 @@
- version = "0.3.23"
+--- below-dump-0.6.3/Cargo.toml 1970-01-01T00:00:01+00:00
++++ below-dump-0.6.3/Cargo.toml 2023-01-20T04:01:13.518232+00:00
+@@ -51,11 +51,6 @@
+
+ [dependencies.regex]
+ version = "1.5.4"
+-features = [
+- "std",
+- "unicode-perl",
+-]
+-default-features = false
+
+ [dependencies.render]
+ version = "0.6.3"
+@@ -80,7 +75,7 @@
+ package = "below-store"
[dependencies.toml]
-version = "=0.5.8"
+version = "0.5.8"
+
[dev-dependencies.tempdir]
version = "0.3"
diff --git a/rust-below-dump.spec b/rust-below-dump.spec
index bb70a17..e30adcf 100644
--- a/rust-below-dump.spec
+++ b/rust-below-dump.spec
@@ -1,23 +1,24 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 23
%bcond_without check
%global debug_package %{nil}
%global crate below-dump
-Name: rust-%{crate}
-Version: 0.5.0
+Name: rust-below-dump
+Version: 0.6.3
Release: %autorelease
Summary: Dump crate for below
-# Upstream license specification: Apache-2.0
-License: ASL 2.0
+License: Apache-2.0
URL: https://crates.io/crates/below-dump
Source: %{crates_source}
-# Initial patched metadata
-# * relax toml dependency from =0.5.8 to ^0.5.8
-Patch0: below-dump-fix-metadata.diff
+# Manually created patch for downstream crate metadata changes
+# * restore use of regex default features (back out https://github.com/facebookincubator/below/pull/8164)
+# * relax toml dependency from =0.5.8 to 0.5.8
+Patch: below-dump-fix-metadata.diff
-ExclusiveArch: %{rust_arches}
+# below-btrfs and below-model are not available
+ExcludeArch: %{ix86}
BuildRequires: rust-packaging >= 21
diff --git a/sources b/sources
index 988d4fa..ad82767 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (below-dump-0.5.0.crate) = 74d5f23dc6241b9f27bbe740507fbca8b48a2d5a028671c2ea9ea96ef704289d6f8c2ed33fea0f500b100f94b360a66a501e1eabf5880f4043d227ccc87528c1
+SHA512 (below-dump-0.6.3.crate) = 33ce1e4bb82480bd84a18cbacd2c30e96d7269f4a6f42c04e0ba190664139447d77f676e614bc3283066b2935be81ec2cccb85c50abb6377624a7b2541eb6fb3
commit 7bbe4c7ee7fb8fac46f604e33d1fc08eb47aae62
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 23 02:55:02 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
10 months, 1 week
Architecture specific change in rpms/rust-below-dump.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-below-dump.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-below-dump.git/commit/?id=cd....
Change:
+ExcludeArch: %{arm32} %{ix86}
Thanks.
Full change:
============
commit cd935d3f39e91613b38c9d4dd02a4deb777fcba1
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Sat Jan 28 23:14:33 2023 -0600
Also exclude builds on 32-bit ARM architectures
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/rust-below-dump.spec b/rust-below-dump.spec
index e30adcf..5940d7b 100644
--- a/rust-below-dump.spec
+++ b/rust-below-dump.spec
@@ -18,7 +18,7 @@ Source: %{crates_source}
Patch: below-dump-fix-metadata.diff
# below-btrfs and below-model are not available
-ExcludeArch: %{ix86}
+ExcludeArch: %{arm32} %{ix86}
BuildRequires: rust-packaging >= 21
10 months, 1 week
Architecture specific change in rpms/rust-below-dump.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-below-dump.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-below-dump.git/commit/?id=07....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 8c49c214383e2dc3783379618fb774482bd3786a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 21:43:40 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit 073d2cd9eb8f794e5769b15b8bd0d459f65979d2
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Thu Jan 19 22:03:43 2023 -0600
Update to 0.6.3
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index a2c505d..3cade72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/below-dump-0.4.1.crate
/below-dump-0.5.0.crate
+/below-dump-0.6.3.crate
diff --git a/below-dump-fix-metadata.diff b/below-dump-fix-metadata.diff
index 4e42e22..7be647e 100644
--- a/below-dump-fix-metadata.diff
+++ b/below-dump-fix-metadata.diff
@@ -1,10 +1,23 @@
---- below-dump-0.5.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ below-dump-0.5.0/Cargo.toml 2022-06-01T14:57:15.529921+00:00
-@@ -57,6 +57,6 @@
- version = "0.3.23"
+--- below-dump-0.6.3/Cargo.toml 1970-01-01T00:00:01+00:00
++++ below-dump-0.6.3/Cargo.toml 2023-01-20T04:01:13.518232+00:00
+@@ -51,11 +51,6 @@
+
+ [dependencies.regex]
+ version = "1.5.4"
+-features = [
+- "std",
+- "unicode-perl",
+-]
+-default-features = false
+
+ [dependencies.render]
+ version = "0.6.3"
+@@ -80,7 +75,7 @@
+ package = "below-store"
[dependencies.toml]
-version = "=0.5.8"
+version = "0.5.8"
+
[dev-dependencies.tempdir]
version = "0.3"
diff --git a/rust-below-dump.spec b/rust-below-dump.spec
index bb70a17..e30adcf 100644
--- a/rust-below-dump.spec
+++ b/rust-below-dump.spec
@@ -1,23 +1,24 @@
-# Generated by rust2rpm 21
+# Generated by rust2rpm 23
%bcond_without check
%global debug_package %{nil}
%global crate below-dump
-Name: rust-%{crate}
-Version: 0.5.0
+Name: rust-below-dump
+Version: 0.6.3
Release: %autorelease
Summary: Dump crate for below
-# Upstream license specification: Apache-2.0
-License: ASL 2.0
+License: Apache-2.0
URL: https://crates.io/crates/below-dump
Source: %{crates_source}
-# Initial patched metadata
-# * relax toml dependency from =0.5.8 to ^0.5.8
-Patch0: below-dump-fix-metadata.diff
+# Manually created patch for downstream crate metadata changes
+# * restore use of regex default features (back out https://github.com/facebookincubator/below/pull/8164)
+# * relax toml dependency from =0.5.8 to 0.5.8
+Patch: below-dump-fix-metadata.diff
-ExclusiveArch: %{rust_arches}
+# below-btrfs and below-model are not available
+ExcludeArch: %{ix86}
BuildRequires: rust-packaging >= 21
diff --git a/sources b/sources
index 988d4fa..ad82767 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (below-dump-0.5.0.crate) = 74d5f23dc6241b9f27bbe740507fbca8b48a2d5a028671c2ea9ea96ef704289d6f8c2ed33fea0f500b100f94b360a66a501e1eabf5880f4043d227ccc87528c1
+SHA512 (below-dump-0.6.3.crate) = 33ce1e4bb82480bd84a18cbacd2c30e96d7269f4a6f42c04e0ba190664139447d77f676e614bc3283066b2935be81ec2cccb85c50abb6377624a7b2541eb6fb3
10 months, 1 week
Architecture specific change in rpms/rust-below-render.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-below-render.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-below-render.git/commit/?id=....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit f23b3eda62035d5492b6ef730a834b82cd3927c5
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 21:43:59 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit e500c20040e69f963e72e7cd9fedd43b377602b3
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Jan 18 23:05:30 2023 -0600
Update to 0.6.3
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index e281d6f..7e6caa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/below-render-0.4.1.crate
/below-render-0.5.0.crate
+/below-render-0.6.3.crate
diff --git a/rust-below-render.spec b/rust-below-render.spec
index 7836089..09d154e 100644
--- a/rust-below-render.spec
+++ b/rust-below-render.spec
@@ -1,22 +1,19 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 23
%bcond_without check
%global debug_package %{nil}
%global crate below-render
-Name: rust-%{crate}
-Version: 0.5.0
+Name: rust-below-render
+Version: 0.6.3
Release: %autorelease
Summary: Render crate for below
-# Upstream license specification: Apache-2.0
-License: ASL 2.0
+License: Apache-2.0
URL: https://crates.io/crates/below-render
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Render crate for below.}
@@ -33,8 +30,8 @@ This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
-%license LICENSE
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -46,7 +43,7 @@ This package contains library source intended for building other packages which
use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/sources b/sources
index 637bc5d..c291b0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (below-render-0.5.0.crate) = 0cb06b1075b8e5d7e739a8bc1e0fcae6ffd1fc88a7fd1e5d9393956384647c9e31e2420b0f95cb3937d139dbc296ea7cbecec10947e425a4d53a4ba997cac65a
+SHA512 (below-render-0.6.3.crate) = 725542403728a03875700075e64c5b9ecab6fa451d1343b47c6c7a08467ac8006df5e5404269c0f2763aaac065e75be51ee0f9993186deb1afd3aa12bf4ef0c7
commit 4f0e963e90c3760d012d265e447f3b2dc9cb2770
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 23 02:55:26 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
10 months, 1 week
Architecture specific change in rpms/rust-below-render.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-below-render.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-below-render.git/commit/?id=....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit f23b3eda62035d5492b6ef730a834b82cd3927c5
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 21:43:59 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit e500c20040e69f963e72e7cd9fedd43b377602b3
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Jan 18 23:05:30 2023 -0600
Update to 0.6.3
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index e281d6f..7e6caa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/below-render-0.4.1.crate
/below-render-0.5.0.crate
+/below-render-0.6.3.crate
diff --git a/rust-below-render.spec b/rust-below-render.spec
index 7836089..09d154e 100644
--- a/rust-below-render.spec
+++ b/rust-below-render.spec
@@ -1,22 +1,19 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 23
%bcond_without check
%global debug_package %{nil}
%global crate below-render
-Name: rust-%{crate}
-Version: 0.5.0
+Name: rust-below-render
+Version: 0.6.3
Release: %autorelease
Summary: Render crate for below
-# Upstream license specification: Apache-2.0
-License: ASL 2.0
+License: Apache-2.0
URL: https://crates.io/crates/below-render
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Render crate for below.}
@@ -33,8 +30,8 @@ This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
-%license LICENSE
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -46,7 +43,7 @@ This package contains library source intended for building other packages which
use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/sources b/sources
index 637bc5d..c291b0c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (below-render-0.5.0.crate) = 0cb06b1075b8e5d7e739a8bc1e0fcae6ffd1fc88a7fd1e5d9393956384647c9e31e2420b0f95cb3937d139dbc296ea7cbecec10947e425a4d53a4ba997cac65a
+SHA512 (below-render-0.6.3.crate) = 725542403728a03875700075e64c5b9ecab6fa451d1343b47c6c7a08467ac8006df5e5404269c0f2763aaac065e75be51ee0f9993186deb1afd3aa12bf4ef0c7
10 months, 1 week
Architecture specific change in rpms/rust-below-store.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-below-store.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-below-store.git/commit/?id=b....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit be581d668b93e77ba11e9576e5adfc5aace7ab18
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 21:44:09 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit be4411a3e3712d2c07cdadad29cd2b6a92d865d9
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Jan 18 22:38:19 2023 -0600
Update to 0.6.3
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index 95a7c40..22c6adb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/below-store-0.4.1.crate
/below-store-0.5.0.crate
+/below-store-0.6.3.crate
diff --git a/below-store-fix-metadata.diff b/below-store-fix-metadata.diff
index c79fa90..6569102 100644
--- a/below-store-fix-metadata.diff
+++ b/below-store-fix-metadata.diff
@@ -1,11 +1,34 @@
---- below-store-0.5.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ below-store-0.5.0/Cargo.toml 2022-08-06T19:30:55.786610+00:00
-@@ -62,7 +62,7 @@
+--- below-store-0.6.3/Cargo.toml 1970-01-01T00:00:01+00:00
++++ below-store-0.6.3/Cargo.toml 2023-01-19T04:51:17.532109+00:00
+@@ -50,7 +50,7 @@
+ package = "below-model"
+
+ [dependencies.nix]
+-version = "0.25"
++version = "0.26"
+
+ [dependencies.serde]
+ version = "1.0.136"
+@@ -73,7 +73,7 @@
version = "1.1.0"
- [dependencies.zstd]
--version = "=0.8.0+zstd.1.4.9"
-+version = "0.11"
+ [dependencies.zstd-safe]
+-version = "5.0.1+zstd.1.5.2"
++version = "5.0.1"
+ features = ["std"]
+
[dev-dependencies.itertools]
- version = "0.10.3"
+@@ -91,10 +91,11 @@
+ [dev-dependencies.tempdir]
+ version = "0.3"
+
+-[dev-dependencies.zstd]
+-version = "0.11.1+zstd.1.5.2"
++[dependencies.zstd]
++version = "0.11.1"
+ [features]
++default = ["no-vendor"]
+ no-vendor = [
+ "zstd-safe/pkg-config",
+ "zstd/pkg-config",
diff --git a/rust-below-store.spec b/rust-below-store.spec
index 2cc2e47..bffc4bb 100644
--- a/rust-below-store.spec
+++ b/rust-below-store.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 23
%bcond_without check
%global debug_package %{nil}
%global crate below-store
Name: rust-below-store
-Version: 0.5.0
+Version: 0.6.3
Release: %autorelease
Summary: Store crate for below
@@ -13,12 +13,11 @@ License: Apache-2.0
URL: https://crates.io/crates/below-store
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
-# * bump zstd from 0.8 to 0.11
+# * bump nix from 0.25 to 0.26
+# * drop version suffix from zstd and zstd-safe deps
+# * make zstd a dependency, not a dev-dependency, for no-vendor
+# * make no-vendor default
Patch: below-store-fix-metadata.diff
-# * port to zstd 0.10 / 0.11
-Patch1: 0001-port-to-zstd-0.10.patch
-
-ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging >= 21
@@ -52,6 +51,18 @@ use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
+%package -n %{name}+no-vendor-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+no-vendor-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "no-vendor" feature of the "%{crate}" crate.
+
+%files -n %{name}+no-vendor-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
diff --git a/sources b/sources
index 0557fab..d0fc5db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (below-store-0.5.0.crate) = 4cb982a2492e41933dd3fe5499c9452286c0a5e527b7d662fd1b5b231e9f058a79149fce4d3316ce716e0c35cb4fc2790d8f3620819242d3b8bcba3fe8287ed0
+SHA512 (below-store-0.6.3.crate) = ce2763e09a68fdb64e73d3147866d9c2343e5a6638ecb3eb4d9724373dc9e816e7e207aa24b5ee41fd6893f051fb40bcbc6c1d67c05ae4c3007e7e1baa4f3600
10 months, 1 week
Architecture specific change in rpms/rust-below-store.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-below-store.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-below-store.git/commit/?id=b....
Change:
-ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit be581d668b93e77ba11e9576e5adfc5aace7ab18
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 21:44:09 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit be4411a3e3712d2c07cdadad29cd2b6a92d865d9
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Jan 18 22:38:19 2023 -0600
Update to 0.6.3
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index 95a7c40..22c6adb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/below-store-0.4.1.crate
/below-store-0.5.0.crate
+/below-store-0.6.3.crate
diff --git a/below-store-fix-metadata.diff b/below-store-fix-metadata.diff
index c79fa90..6569102 100644
--- a/below-store-fix-metadata.diff
+++ b/below-store-fix-metadata.diff
@@ -1,11 +1,34 @@
---- below-store-0.5.0/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ below-store-0.5.0/Cargo.toml 2022-08-06T19:30:55.786610+00:00
-@@ -62,7 +62,7 @@
+--- below-store-0.6.3/Cargo.toml 1970-01-01T00:00:01+00:00
++++ below-store-0.6.3/Cargo.toml 2023-01-19T04:51:17.532109+00:00
+@@ -50,7 +50,7 @@
+ package = "below-model"
+
+ [dependencies.nix]
+-version = "0.25"
++version = "0.26"
+
+ [dependencies.serde]
+ version = "1.0.136"
+@@ -73,7 +73,7 @@
version = "1.1.0"
- [dependencies.zstd]
--version = "=0.8.0+zstd.1.4.9"
-+version = "0.11"
+ [dependencies.zstd-safe]
+-version = "5.0.1+zstd.1.5.2"
++version = "5.0.1"
+ features = ["std"]
+
[dev-dependencies.itertools]
- version = "0.10.3"
+@@ -91,10 +91,11 @@
+ [dev-dependencies.tempdir]
+ version = "0.3"
+
+-[dev-dependencies.zstd]
+-version = "0.11.1+zstd.1.5.2"
++[dependencies.zstd]
++version = "0.11.1"
+ [features]
++default = ["no-vendor"]
+ no-vendor = [
+ "zstd-safe/pkg-config",
+ "zstd/pkg-config",
diff --git a/rust-below-store.spec b/rust-below-store.spec
index 2cc2e47..bffc4bb 100644
--- a/rust-below-store.spec
+++ b/rust-below-store.spec
@@ -1,11 +1,11 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 23
%bcond_without check
%global debug_package %{nil}
%global crate below-store
Name: rust-below-store
-Version: 0.5.0
+Version: 0.6.3
Release: %autorelease
Summary: Store crate for below
@@ -13,12 +13,11 @@ License: Apache-2.0
URL: https://crates.io/crates/below-store
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
-# * bump zstd from 0.8 to 0.11
+# * bump nix from 0.25 to 0.26
+# * drop version suffix from zstd and zstd-safe deps
+# * make zstd a dependency, not a dev-dependency, for no-vendor
+# * make no-vendor default
Patch: below-store-fix-metadata.diff
-# * port to zstd 0.10 / 0.11
-Patch1: 0001-port-to-zstd-0.10.patch
-
-ExclusiveArch: %{rust_arches}
BuildRequires: rust-packaging >= 21
@@ -52,6 +51,18 @@ use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
+%package -n %{name}+no-vendor-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+no-vendor-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "no-vendor" feature of the "%{crate}" crate.
+
+%files -n %{name}+no-vendor-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%cargo_prep
diff --git a/sources b/sources
index 0557fab..d0fc5db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (below-store-0.5.0.crate) = 4cb982a2492e41933dd3fe5499c9452286c0a5e527b7d662fd1b5b231e9f058a79149fce4d3316ce716e0c35cb4fc2790d8f3620819242d3b8bcba3fe8287ed0
+SHA512 (below-store-0.6.3.crate) = ce2763e09a68fdb64e73d3147866d9c2343e5a6638ecb3eb4d9724373dc9e816e7e207aa24b5ee41fd6893f051fb40bcbc6c1d67c05ae4c3007e7e1baa4f3600
10 months, 1 week
Architecture specific change in rpms/rust-below-model.git
by githook-noreply＠fedoraproject.org
The package rpms/rust-below-model.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/rust-below-model.git/commit/?id=5...
https://src.fedoraproject.org/cgit/rpms/rust-below-model.git/commit/?id=e....
Change:
+ExcludeArch: %{arm32} %{ix86}
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 55be6de9b8618cbcc4bd0c648cab46dff77c7cb2
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Sat Jan 28 21:51:21 2023 -0600
Also exclude builds on 32-bit ARM architectures
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/rust-below-model.spec b/rust-below-model.spec
index b7ddff5..259b575 100644
--- a/rust-below-model.spec
+++ b/rust-below-model.spec
@@ -17,7 +17,7 @@ Source: %{crates_source}
Patch: below-model-fix-metadata.diff
# below-btrfs is not available
-ExcludeArch: %{ix86}
+ExcludeArch: %{arm32} %{ix86}
BuildRequires: rust-packaging >= 21
commit 9397eafe70fc9ccee18b007d1e24e6db28e1fa41
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 20 21:43:49 2023 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
commit e916d58b36e9c82a7aeb882ce87eb5fc1ef6640d
Author: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Wed Jan 18 21:25:39 2023 -0600
Update to 0.6.3
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index 6d9e556..033ace7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/below-model-0.4.1.crate
/below-model-0.5.0.crate
+/below-model-0.6.3.crate
diff --git a/below-model-fix-metadata.diff b/below-model-fix-metadata.diff
new file mode 100644
index 0000000..84dc3e8
--- /dev/null
+++ b/below-model-fix-metadata.diff
@@ -0,0 +1,14 @@
+--- below-model-0.6.3/Cargo.toml 1970-01-01T00:00:01+00:00
++++ below-model-0.6.3/Cargo.toml 2023-01-19T03:22:16.573672+00:00
+@@ -58,11 +58,6 @@
+
+ [dependencies.regex]
+ version = "1.5.4"
+-features = [
+- "std",
+- "unicode-perl",
+-]
+-default-features = false
+
+ [dependencies.serde]
+ version = "1.0.136"
diff --git a/rust-below-model.spec b/rust-below-model.spec
index d4c55d8..b7ddff5 100644
--- a/rust-below-model.spec
+++ b/rust-below-model.spec
@@ -1,22 +1,25 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 23
%bcond_without check
%global debug_package %{nil}
%global crate below-model
-Name: rust-%{crate}
-Version: 0.5.0
+Name: rust-below-model
+Version: 0.6.3
Release: %autorelease
Summary: Model crate for below
-# Upstream license specification: Apache-2.0
-License: ASL 2.0
+License: Apache-2.0
URL: https://crates.io/crates/below-model
Source: %{crates_source}
+# Manually created patch for downstream crate metadata changes
+# - restore use of regex default features (back out https://github.com/facebookincubator/below/pull/8164)
+Patch: below-model-fix-metadata.diff
-ExclusiveArch: %{rust_arches}
+# below-btrfs is not available
+ExcludeArch: %{ix86}
-BuildRequires: rust-packaging
+BuildRequires: rust-packaging >= 21
%global _description %{expand:
Model crate for below.}
@@ -33,8 +36,8 @@ This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
-%license LICENSE
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE
+%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@@ -46,7 +49,7 @@ This package contains library source intended for building other packages which
use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
-%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
+%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
diff --git a/sources b/sources
index 1ce567b..ad7ea9d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (below-model-0.5.0.crate) = 13a34c79d4fe14bf508569a693a84a2e05c416debcff7dded421254bea6e1f0386fba44146bd4c5a1a9576bcbec25bb708c9d16ebfbf439b8e966e0bb00a7768
+SHA512 (below-model-0.6.3.crate) = 6c65279937a569a4ee4b4616de327e3847a3f284c86e583afe526febad68f715e34602cd853a70f9762fc278c310f6bab048c626c2ee6983796eb4923f4edd1a
10 months, 1 week