diff --git a/_service b/_service index 5f1d4c9..9789bfe 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ https://github.com/Firstyear/cargo-packaging.git - @PARENT_TAG@~git@TAG_OFFSET@.%h + @PARENT_TAG@+@TAG_OFFSET@ git main v* @@ -16,5 +16,13 @@ xz + + cargo-packaging + xz + true + + + cargo-packaging + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..84c16a2 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/Firstyear/cargo-packaging.git + 9701922ebd9a35ce598d7da5408e7fe67b30c62e \ No newline at end of file diff --git a/cargo-packaging-1.0.0~git8.6919af0.tar.xz b/cargo-packaging-1.0.0~git8.6919af0.tar.xz deleted file mode 100644 index 2d96c17..0000000 --- a/cargo-packaging-1.0.0~git8.6919af0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bf49a814a4e4989f3c4055f481555dff3792859000f660376fe9528890afab0 -size 724 diff --git a/cargo-packaging-1.1.0+0.tar.xz b/cargo-packaging-1.1.0+0.tar.xz new file mode 100644 index 0000000..07e9d85 --- /dev/null +++ b/cargo-packaging-1.1.0+0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d98a45bb01d384e812768f793ffc30b40f86b9ab222462b2f7086495a374277 +size 9020 diff --git a/cargo-packaging.changes b/cargo-packaging.changes index 5e7ad1c..310509b 100644 --- a/cargo-packaging.changes +++ b/cargo-packaging.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 03 22:47:05 UTC 2022 - william.brown@suse.com + +- Update to version 1.1.0 + * Improve support for bundle metadata in rpm provides + ------------------------------------------------------------------- Mon May 23 02:15:30 UTC 2022 - william.brown@suse.com diff --git a/cargo-packaging.spec b/cargo-packaging.spec index 3819764..e102e3f 100644 --- a/cargo-packaging.spec +++ b/cargo-packaging.spec @@ -17,32 +17,53 @@ Name: cargo-packaging -Version: 1.0.0~git8.6919af0 +Version: 1.1.0+0 Release: 0 -BuildArch: noarch -Summary: Some macros to assist with cargo and rust packaging +Summary: Macros and tools to assist with cargo and rust packaging License: MPL-2.0 Group: Development/Languages/Rust URL: https://github.com/Firstyear/cargo-packaging Source0: %{name}-%{version}.tar.xz +Source1: vendor.tar.xz +Source2: cargo_config Requires: cargo +Requires: cargo-auditable Requires: zstd +BuildRequires: cargo +BuildRequires: zstd Conflicts: rust-packaging %description -A set of macros to assist with cargo and rust packaging, written in a manner -that follows rust's best practices. +A set of macros and tools to assist with cargo and rust packaging, written in a manner +that follows upstream rust's best practices. %prep -%autosetup +%autosetup -a1 +mkdir .cargo +cp %{SOURCE2} .cargo/config %build +cargo build --offline --release %install +install -D -p -m 0644 -t %{buildroot}%{_fileattrsdir} %{_builddir}/%{name}-%{version}/rust.attr install -D -p -m 0644 -t %{buildroot}%{_rpmconfigdir}/macros.d %{_builddir}/%{name}-%{version}/macros.cargo +install -D -p -m 0755 -t %{buildroot}%{_rpmconfigdir} %{_builddir}/%{name}-%{version}/target/release/rust-rpm-prov + +install -D -p -m 0755 -t %{buildroot}%{_sysconfdir}/zsh_completion.d %{_builddir}/%{name}-%{version}/target/release/build/completions/_rust-rpm-prov +install -D -p -m 0755 -t %{buildroot}%{_sysconfdir}/bash_completion.d %{_builddir}/%{name}-%{version}/target/release/build/completions/rust-rpm-prov.bash + %files + +%{_fileattrsdir}/rust.attr %{_rpmconfigdir}/macros.d/macros.cargo +%{_rpmconfigdir}/rust-rpm-prov + +%dir %{_sysconfdir}/zsh_completion.d +%dir %{_sysconfdir}/bash_completion.d +%{_sysconfdir}/zsh_completion.d/* +%{_sysconfdir}/bash_completion.d/* %changelog diff --git a/cargo_config b/cargo_config new file mode 100644 index 0000000..6fb4ff4 --- /dev/null +++ b/cargo_config @@ -0,0 +1,5 @@ +[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 new file mode 100644 index 0000000..45bd688 --- /dev/null +++ b/vendor.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f34cf204e357eb37bb7a28d308063d29e85aaa7d247750d180b1f5ecf35c30b1 +size 6490776