diff --git a/cargo_config b/cargo_config deleted file mode 100644 index 6fb4ff4..0000000 --- a/cargo_config +++ /dev/null @@ -1,5 +0,0 @@ -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" \ No newline at end of file diff --git a/glycin-loaders-0.1.2.obscpio b/glycin-loaders-0.1.2.obscpio index b666990..816dcea 100644 --- a/glycin-loaders-0.1.2.obscpio +++ b/glycin-loaders-0.1.2.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc19a76075e88c92fe45322dad0824543ef91527ac0563bb3b543febcccebdf0 +oid sha256:a9c6f2d0e433e9338b6a9b05cfa9992af4967c7dcde4488ee0d3a77d20edcc2a size 11085325 diff --git a/glycin-loaders.changes b/glycin-loaders.changes index ff8ee28..f9d2c24 100644 --- a/glycin-loaders.changes +++ b/glycin-loaders.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Nov 30 12:58:21 UTC 2023 - Bjørn Lie + +- Run service with new obs-service-cargo, drop cargo_config as + source and clean up spec and. Cargo_audit and cargo_config are + now part of the cargo_vendor tarball/service, but in this case, + since the sourcedir in _service is called glycin, we need to keep + the manual set cargo_audit in _service to clear validation. + ------------------------------------------------------------------- Tue Nov 14 20:05:44 UTC 2023 - Bjørn Lie diff --git a/glycin-loaders.spec b/glycin-loaders.spec index 152332c..c5a2ec2 100644 --- a/glycin-loaders.spec +++ b/glycin-loaders.spec @@ -23,8 +23,7 @@ Summary: Sandboxed image rendering License: LGPL-2.1-or-later OR MPL-2.0 URL: https://gitlab.gnome.org/sophie-h/glycin Source0: %{name}-%{version}.tar.zst -Source2: vendor.tar.zst -Source3: cargo_config +Source1: vendor.tar.zst BuildRequires: cargo-packaging BuildRequires: git @@ -39,9 +38,7 @@ BuildRequires: pkgconfig(libxml-2.0) Sandboxed and extendable image decoding. %prep -%autosetup -p1 -a2 -mkdir .cargo -cp %{SOURCE3} .cargo/config +%autosetup -p1 -a1 %build export RUSTFLAGS="%{build_rustflags}" diff --git a/vendor.tar.zst b/vendor.tar.zst index fe66ad5..64093bb 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:43be3e35e9de1fc7e7936c167e5611accdb701021c492fcf5790d2e42f6c53cc -size 34114410 +oid sha256:9f65349c04e96585c319b2b2fa8bb8909affba4d9046e09374ae9944da04777f +size 37772664