!4 Upgrade to version 15

From: @tong_1001
Reviewed-by: @small_leek
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2021-02-02 21:25:42 +08:00 committed by Gitee
commit 1f98e035bc
4 changed files with 7 additions and 4 deletions

View File

@ -12,7 +12,7 @@ Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/macros.cargo b/data/macros.cargo
index 1182850..5066587 100644
index 9bafc86..d13b7fa 100644
--- a/data/macros.cargo
+++ b/data/macros.cargo
@@ -89,7 +89,8 @@ if %__cargo_is_lib; then \
@ -22,9 +22,9 @@ index 1182850..5066587 100644
- %{__awk} -i inplace -v INPLACE_SUFFIX=.deps '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' Cargo.toml \
+ mv Cargo.toml{,.deps} \
+ awk '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' Cargo.toml.deps > Cargo.toml \
%{__cargo} package -l | xargs -d '\\\n' %{__cp} --parents -a -t $REG_DIR \
%{__cargo} package -l | grep -w -E -v 'Cargo.(lock|toml.orig)' | xargs -d '\\\n' %{__cp} --parents -a -t $REG_DIR \
%{__mv} Cargo.toml{.deps,} \
%{__cp} -a Cargo.toml $REG_DIR/Cargo.toml \
--
2.22.0
1.8.3.1

View File

@ -3,7 +3,7 @@
%global debug_package %{nil}
Name: rust-packaging
Version: 10
Version: 15
Release: 1
Summary: RPM macros for building Rust packages on various architectures
License: MIT
@ -65,5 +65,8 @@ py.test-%{python3_version} -vv test.py
%{python3_sitelib}/rust2rpm-*.egg-info/
%changelog
* Tue Feb 02 2021 shixuantong <shixuantong@huawei.com> - 15-1
- Upgrade to version 15
* Wed Mar 4 2020 hexiujun <hexiujun1@huawei.com> - 10-1
- Package init

Binary file not shown.

BIN
rust2rpm-15.tar.xz Normal file

Binary file not shown.