!12 升级rust-packaging版本至21

From: @duyiwei7w 
Reviewed-by: @jingxiaolu 
Signed-off-by: @jingxiaolu

0001-macros-Do-not-use-awk-s-inplace-feature.patch

@@ -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
 

rust-packaging.spec

@@ -3,12 +3,12 @@
 %global debug_package %{nil}
 
 Name:           rust-packaging
-Version:        10
+Version:        21
 Release:        1
 Summary:        RPM macros for building Rust packages on various architectures
 License:        MIT
 URL:            https://pagure.io/fedora-rust/rust2rpm
-Source:         https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz
+Source:         https://pagure.io/fedora-rust/rust2rpm/archive/v%{version}/rust2rpm-v%{version}.tar.gz
 
 Patch0001:      0001-macros-Do-not-use-awk-s-inplace-feature.patch
 
@@ -18,7 +18,7 @@ BuildRequires:  python3-pytest cargo python3-semantic_version
 
 # gawk is needed for stripping dev-deps in macro
 Requires:       gawk python3-rust2rpm = %{version}-%{release}
-Requires:       rust-srpm-macros = %{version} rust cargo
+Requires:       rust-srpm-macros rust cargo
 
 %description
 The package provides macros for building projects in Rust
@@ -36,7 +36,7 @@ Provides:       rust2rpm = %{version}-%{release}
 Convert Rust packages to RPM.
 
 %prep
-%autosetup -n rust2rpm-%{version} -p1
+%autosetup -n rust2rpm-v%{version} -p1
 
 %build
 %py3_build
@@ -65,5 +65,17 @@ py.test-%{python3_version} -vv test.py
 %{python3_sitelib}/rust2rpm-*.egg-info/
 
 %changelog
+* Tue Nov 08 2022 duyiwei <duyiwei@kylinos.cn> - 21-1
+- upgrade version to 21
+
+* Tue Jan 18 2022 SimpleUpdate Robot <tc@openeuler.org> - 20-1
+- Upgrade to version 20
+
+* Thu Mar 18 2021 shixuantong <shixuantong@huawei.com> - 15-2
+- fix install fail issue because nothing provides rust-srpm-macros = 15
+
+* 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

rust-packaging.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: rust-lang-deprecated/rust-packaging
+tag_prefix: ^v
+seperator: .