diff --git a/0001-inspector-inject-cargo-dependency-in-runtime.patch b/0001-inspector-inject-cargo-dependency-in-runtime.patch index 35e2831..675f2ca 100644 --- a/0001-inspector-inject-cargo-dependency-in-runtime.patch +++ b/0001-inspector-inject-cargo-dependency-in-runtime.patch @@ -1,7 +1,7 @@ From 9e0a872ece6f5aedf76ffd67044f22c7d0cba8aa Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 20 Oct 2017 18:04:31 +0200 -Subject: [PATCH 1/2] inspector: inject cargo dependency in runtime +Subject: [PATCH 1/3] inspector: inject cargo dependency in runtime Fixes: https://pagure.io/fedora-rust/rust2rpm/issue/42 Signed-off-by: Igor Gnatenko @@ -37,5 +37,5 @@ index d08f1aa..6ccdbc2 100644 if __name__ == "__main__": main() -- -2.14.2 +2.15.0 diff --git a/0002-inspector-inject-rust-packaging-dependency-in-buildt.patch b/0002-inspector-inject-rust-packaging-dependency-in-buildt.patch index 44777cf..bfa9764 100644 --- a/0002-inspector-inject-rust-packaging-dependency-in-buildt.patch +++ b/0002-inspector-inject-rust-packaging-dependency-in-buildt.patch @@ -1,7 +1,7 @@ From 45a5caf30060c182fb0ae03a1a7e4e707599aaa3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 21 Oct 2017 09:45:30 +0200 -Subject: [PATCH 2/2] inspector: inject rust-packaging dependency in buildtime +Subject: [PATCH 2/3] inspector: inject rust-packaging dependency in buildtime For consistency with previous commit. @@ -24,5 +24,5 @@ index 6ccdbc2..2d488b2 100644 if __name__ == "__main__": main() -- -2.14.2 +2.15.0 diff --git a/0003-use-cp-instead-of-install.patch b/0003-use-cp-instead-of-install.patch new file mode 100644 index 0000000..7c7b726 --- /dev/null +++ b/0003-use-cp-instead-of-install.patch @@ -0,0 +1,31 @@ +From 59809d4940822edaa361507ecea93b84e3c43ec0 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sat, 4 Nov 2017 15:32:39 +0100 +Subject: [PATCH 3/3] use cp instead of install + +We want to preserve original modes and so on. + +Signed-off-by: Igor Gnatenko +--- + data/macros.cargo | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/macros.cargo b/data/macros.cargo +index 09bbcea..e52f87c 100644 +--- a/data/macros.cargo ++++ b/data/macros.cargo +@@ -45,9 +45,9 @@ if %__cargo_is_lib; then \ + CRATE_VERSION=$(%__cargo_inspector --version Cargo.toml) \ + REG_DIR=%{buildroot}%{cargo_registry}/$CRATE_NAME-$CRATE_VERSION \ + %{__mkdir} -p $REG_DIR \ +- %__cargo package -l | xargs cp --parents -p -t $REG_DIR \ ++ %__cargo package -l | xargs %{__cp} --parents -a -t $REG_DIR \ + %if ! %{with check} \ +- %{__install} -p Cargo.toml.orig $REG_DIR/Cargo.toml \ ++ %{__cp} -a Cargo.toml.orig $REG_DIR/Cargo.toml \ + %endif \ + echo '{"files":{},"package":""}' > $REG_DIR/.cargo-checksum.json \ + fi \ +-- +2.15.0 + diff --git a/rust-packaging.spec b/rust-packaging.spec index edae99b..4ee9c1f 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -2,15 +2,16 @@ Name: rust-packaging Version: 4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: RPM macros for building Rust packages on various architectures License: MIT URL: https://pagure.io/fedora-rust/rust2rpm Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz -# https://pagure.io/fedora-rust/rust2rpm/pull-request/43 +# Commits since last release Patch0001: 0001-inspector-inject-cargo-dependency-in-runtime.patch Patch0002: 0002-inspector-inject-rust-packaging-dependency-in-buildt.patch +Patch0003: 0003-use-cp-instead-of-install.patch BuildArch: noarch ExclusiveArch: %{rust_arches} noarch @@ -86,6 +87,9 @@ py.test-%{python3_version} -v test.py %{python3_sitelib}/rust2rpm/ %changelog +* Sat Nov 04 2017 Igor Gnatenko - 4-6 +- Use cp instead of install + * Sat Oct 21 2017 Igor Gnatenko - 4-5 - Generate runtime dependencyon cargo for devel subpackages