diff --git a/0001-macros-Do-not-use-awk-s-inplace-feature.patch b/0001-macros-Do-not-use-awk-s-inplace-feature.patch index dd83986..507677f 100644 --- a/0001-macros-Do-not-use-awk-s-inplace-feature.patch +++ b/0001-macros-Do-not-use-awk-s-inplace-feature.patch @@ -12,7 +12,7 @@ Signed-off-by: Igor Gnatenko 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 diff --git a/rust-packaging.spec b/rust-packaging.spec index 41ce8fd..68aac18 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -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 - 15-1 +- Upgrade to version 15 + * Wed Mar 4 2020 hexiujun - 10-1 - Package init diff --git a/rust2rpm-10.tar.xz b/rust2rpm-10.tar.xz deleted file mode 100644 index 99cf975..0000000 Binary files a/rust2rpm-10.tar.xz and /dev/null differ diff --git a/rust2rpm-15.tar.xz b/rust2rpm-15.tar.xz new file mode 100644 index 0000000..ffd3ec8 Binary files /dev/null and b/rust2rpm-15.tar.xz differ