diff --git a/README.suse-maint b/README.suse-maint index b4535ea..25bcd46 100644 --- a/README.suse-maint +++ b/README.suse-maint @@ -2,24 +2,16 @@ ## Prerequisites: You need the download_files and cargo_vendor obs services installed: - zypper in obs-service-download_files obs-service-cargo_vendor + zypper in obs-service-obs_scm obs-service-cargo_vendor ## Updating to a new version from upstream -Edit the spec file and update the version variable. +Edit the _service file and update the revision parameter. Download the new source file by running: - osc service ra download_files - -Uncompress the cargo-c-%{version}.tar.gz file: - tar xvfz cargo-c-%{version}.tar.gz - -This will create a cargo-c-%{version} directory - -Edit the _service file and set the srcdir param -to the extracted directory. + osc service mr obs_scm Run the cargo_vendor service with: - osc service disabledrun + osc service mr cargo_vendor Update the changelog file with the upstream release notes. diff --git a/_service b/_service index 27beb0e..0f89285 100644 --- a/_service +++ b/_service @@ -3,14 +3,14 @@ https://github.com/lu-zero/cargo-c.git @PARENT_TAG@~git@TAG_OFFSET@.%h git - v0.9.32 + v0.10.3 * v(\d+\.\d+\.\d+) \1 enable - - + + *.tar xz @@ -20,7 +20,4 @@ xz true - - cargo-c - diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..7f2e7f4 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/lu-zero/cargo-c.git + ee7d7ef74b9c1fa00c6780da41a838752c76b3eb \ No newline at end of file diff --git a/cargo-c-0.10.3~git0.ee7d7ef.obscpio b/cargo-c-0.10.3~git0.ee7d7ef.obscpio new file mode 100644 index 0000000..6797fec --- /dev/null +++ b/cargo-c-0.10.3~git0.ee7d7ef.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e0d02b79b50a1f8ca5b46607a7b630b584602281a3959d34f536a0f82de4f19 +size 135691 diff --git a/cargo-c-0.9.32~git0.56dfe34.tar.xz b/cargo-c-0.9.32~git0.56dfe34.tar.xz deleted file mode 100644 index 87ee115..0000000 --- a/cargo-c-0.9.32~git0.56dfe34.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:573fb69567f880a5be20235094a52c2716e7077e253d69bd0852ce7ea39fcac9 -size 27164 diff --git a/cargo-c.changes b/cargo-c.changes index aabdb8b..4ccb04e 100644 --- a/cargo-c.changes +++ b/cargo-c.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 27 09:20:15 UTC 2024 - Enrico Belleri + +- Update to version 0.10.3~git0.ee7d7ef: + * Wire in the heuristics + * Implement heuristics for target-specific install paths + * Fix the generated header fingerprinting logic + * Make notice about missing windows debug files verbose-only + * Update dependencies + * Require cargo 0.80.0 +- Use macros from cargo-packaging +- Remove cargo_config: contained in vendor.tar +- Remove cargo_audit service: now part of cargo_vendor +- Remove custom rustflags and let the macros set them instead + ------------------------------------------------------------------- Tue Jun 04 19:59:22 UTC 2024 - david.mulder@suse.com diff --git a/cargo-c.obsinfo b/cargo-c.obsinfo new file mode 100644 index 0000000..9f9c828 --- /dev/null +++ b/cargo-c.obsinfo @@ -0,0 +1,4 @@ +name: cargo-c +version: 0.10.3~git0.ee7d7ef +mtime: 1722315713 +commit: ee7d7ef74b9c1fa00c6780da41a838752c76b3eb diff --git a/cargo-c.spec b/cargo-c.spec index 636971e..758eb40 100644 --- a/cargo-c.spec +++ b/cargo-c.spec @@ -17,10 +17,8 @@ # -%global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2 - Name: cargo-c -Version: 0.9.32~git0.56dfe34 +Version: 0.10.3~git0.ee7d7ef Release: 0 Summary: Helper to build and install c-like libraries from Rust License: MIT @@ -29,11 +27,10 @@ Group: Development/Languages/Rust URL: https://crates.io/crates/cargo-c Source0: %{name}-%{version}.tar.xz Source1: vendor.tar.xz -Source2: cargo_config - Source1000: README.suse-maint -BuildRequires: cargo +BuildRequires: cargo >= 0.80.0 BuildRequires: pkgconfig(openssl) +BuildRequires: cargo-packaging %description The is a cargo applet to build and install C-ABI compatibile dynamic and static @@ -46,20 +43,14 @@ software. %prep %autosetup -a1 -p1 -install -d -m 0755 .cargo -cp %{SOURCE2} .cargo/config - %build -export RUSTFLAGS="%{rustflags}" -cargo build --offline --release +%{cargo_build} %install -export RUSTFLAGS="%{rustflags}" -cargo install --offline --root=%{buildroot}%{_prefix} --path . +%{cargo_install} find %{buildroot} -name .crates2.json -delete rm -rf %{buildroot}%{_datadir}/cargo/registry -rm %{buildroot}%{_prefix}/.crates.toml %files %license LICENSE 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/vendor.tar.xz b/vendor.tar.xz index 31ea0c8..0f34038 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0423b170d373d65f6c953284df3a4ecd932c7ea6933e29504c1e19b34683bad6 -size 42712376 +oid sha256:08eec4a945e29ad9b1210fe3b34ce4e1a58862a0e913371c436eccd3e3aa82db +size 45553020