Use ostree-rs-ext 0.5.0

Part of coreos/enhancements#7
cgwalters · Nov 4, 2021 · ae49efa · ae49efa
1 parent 0c4cf93
commit ae49efa
Show file tree

Hide file tree

Showing 11 changed files with 312 additions and 112 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -51,7 +51,7 @@ nix = "0.23.0"
 openat = "0.1.21"
 openat-ext = "^0.2.2"
 os-release = "0.1.0"
-ostree-ext = "0.3.0"
+ostree-ext = "0.4.0"
 paste = "1.0"
 phf = { version = "0.10", features = ["macros"] }
 rand = "0.8.4"
@@ -104,3 +104,6 @@ fedora-integration = []
 sanitizers = []
 
 default = []
+
+[patch.crates-io]
+ostree-ext = { path = "../../ostreedev/ostree-rs-ext/lib" }
diff --git a/packaging/rpm-ostree.spec.in b/packaging/rpm-ostree.spec.in
@@ -48,7 +48,7 @@ BuildRequires: gnome-common
 BuildRequires: /usr/bin/g-ir-scanner
 # Core requirements
 # One way to check this: `objdump -p /path/to/rpm-ostree | grep LIBOSTREE` and pick the highest (though that might miss e.g. new struct members)
-BuildRequires: pkgconfig(ostree-1) >= 2021.1
+BuildRequires: pkgconfig(ostree-1) >= 2021.5
 BuildRequires: pkgconfig(polkit-gobject-1)
 BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(rpm) >= 4.14.0