rpms
/
rust-packaging
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Escape `\n` properly in macro file

Browse Source 
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
epel9
Igor Gnatenko 6 years ago
parent 5955f7d37d
commit 60f3d8f016
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C
20 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
0001-name-spec-patch_file-by-real-crate-name.patch
Unescape View File

@ -1,7 +1,7 @@
From 0dc9fc182edf0791ca697f587e48dd39948d63c1 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 10 Sep 2018 23:37:40 +0200
Subject: [PATCH 01/18] name spec/patch_file by real crate name
Subject: [PATCH 01/19] name spec/patch_file by real crate name
When renaming using patch file, we really want to change file names too.

2
0002-generate-doc-statements.patch
Unescape View File

@ -1,7 +1,7 @@
From 561280a0ea35f226ef243526be2bbb656db44af6 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 10 Sep 2018 23:40:18 +0200
Subject: [PATCH 02/18] generate %doc statements
Subject: [PATCH 02/19] generate %doc statements
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---

2
0003-do-better-for-renamed-crates.patch
Unescape View File

@ -1,7 +1,7 @@
From 2050880140d4953b9ebdc7211e30df3ccf5dd61d Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 11 Sep 2018 00:06:50 +0200
Subject: [PATCH 03/18] do better for renamed crates
Subject: [PATCH 03/19] do better for renamed crates
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---

2
0004-remove-pre-3.6-leftovers.patch
Unescape View File

@ -1,7 +1,7 @@
From e6e9cbbb71199c2773b47fa21f1c917a167c1743 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 11 Sep 2018 10:43:53 +0200
Subject: [PATCH 04/18] remove pre-3.6 leftovers
Subject: [PATCH 04/19] remove pre-3.6 leftovers
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---

2
0005-Remove-half-downloaded-crate-on-C.patch
Unescape View File

@ -1,7 +1,7 @@
From 2f12c83d14afe71e9efed2d1be62e1e610e602e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 17 Aug 2018 10:03:48 +0200
Subject: [PATCH 05/18] Remove half-downloaded crate on ^C
Subject: [PATCH 05/19] Remove half-downloaded crate on ^C
Subsequent invocations would fail with an error about a corrupted file.
We don't have support for resuming a failed download, so let's remove the

2
0006-Throw-an-error-if-s-is-used-without-a-crate.patch
Unescape View File

@ -1,7 +1,7 @@
From 5a1cde5b8dcaea74ebb2050879036bf46df63adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 17 Aug 2018 10:18:59 +0200
Subject: [PATCH 06/18] Throw an error if -s is used without a crate
Subject: [PATCH 06/19] Throw an error if -s is used without a crate
In the future we might want to be smarter and find the crate, but let's at least
not ignore the option completely.

2
0007-split-features-into-subpackages.patch
Unescape View File

@ -1,7 +1,7 @@
From 2cac5e5ad5ff5472923ce333bef59679612bbaa2 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Fri, 26 Oct 2018 11:20:13 +0200
Subject: [PATCH 07/18] split features into subpackages
Subject: [PATCH 07/19] split features into subpackages
References: https://discussion.fedoraproject.org/t/rfc-new-crates-packaging-design-features-have-their-own-subpackages/563?u=ignatenkobrain
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

2
0008-add-support-for-dependencies-with-same-name.patch
Unescape View File

@ -1,7 +1,7 @@
From a1d3a84645aa7bbe5ca07b60bead1ddf90a21cc1 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Tue, 30 Oct 2018 20:37:38 +0100
Subject: [PATCH 08/18] add support for dependencies with same name
Subject: [PATCH 08/19] add support for dependencies with same name
Reported-by: Josh Stone <jistone@redhat.com>
References: https://internals.rust-lang.org/t/optional-dependencies-with-same-name/8728

2
0009-add-support-for-feeding-user-configuration.patch
Unescape View File

@ -1,7 +1,7 @@
From 197150ee2e862edcd46f7ab02c9e4d17e49ca75d Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 31 Oct 2018 18:03:21 +0100
Subject: [PATCH 09/18] add support for feeding user configuration
Subject: [PATCH 09/19] add support for feeding user configuration
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---

2
0010-trivial-use-f-strings-everywhere.patch
Unescape View File

@ -1,7 +1,7 @@
From 83ea3796cd28ec7689b39e7dc7a70bd11af1abf1 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Wed, 31 Oct 2018 17:00:58 +0100
Subject: [PATCH 10/18] trivial: use f-strings everywhere
Subject: [PATCH 10/19] trivial: use f-strings everywhere
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---

2
0011-Add-option-to-not-generate-a-default-changelog-entry.patch
Unescape View File

@ -1,7 +1,7 @@
From 294c6f571c0f4f7ed5a4fcb34142b0d332c55f29 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Sun, 11 Nov 2018 11:06:27 -0500
Subject: [PATCH 11/18] Add option to not generate a default changelog entry
Subject: [PATCH 11/19] Add option to not generate a default changelog entry
For Rust packages created through the OBS source service, the
changelog is managed by an external <pkg>.changes file that is

2
0012-Set-CARGO_HOME-to-the-local-.config.patch
Unescape View File

@ -1,7 +1,7 @@
From b4e25038296cd57eba639a059e8baaf139a5d287 Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Fri, 7 Dec 2018 13:58:41 -0800
Subject: [PATCH 12/18] Set CARGO_HOME to the local .config
Subject: [PATCH 12/19] Set CARGO_HOME to the local .config
---
data/macros.cargo | 6 +++++-

2
0013-Set-the-install-root-in-.cargo-config.patch
Unescape View File

@ -1,7 +1,7 @@
From a04e95bc4f807139bd3c4b75f46fd9a60ec1db8f Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Fri, 7 Dec 2018 13:59:03 -0800
Subject: [PATCH 13/18] Set the install root in .cargo/config
Subject: [PATCH 13/19] Set the install root in .cargo/config
---
data/macros.cargo | 4 +++-

2
0014-licensing-fix-zlib-license-translation.patch
Unescape View File

@ -1,7 +1,7 @@
From 7c00b0f29085166b1a89aec766945b10dc7aca23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 1 Dec 2018 15:40:08 +0100
Subject: [PATCH 14/18] licensing: fix zlib license translation
Subject: [PATCH 14/19] licensing: fix zlib license translation
The file was mangled, and something about "teeworlds" was inserted
into the line for zlib. The spdx database doesn't list "teeworlds

2
0015-licensing-rename-EPL-to-EPL-1.0-and-add-EPL-2.0.patch
Unescape View File

@ -1,7 +1,7 @@
From b0d2756917b380a5d66d2407dbeb8891c51875e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 1 Dec 2018 15:46:08 +0100
Subject: [PATCH 15/18] licensing: rename EPL to EPL-1.0 and add EPL-2.0
Subject: [PATCH 15/19] licensing: rename EPL to EPL-1.0 and add EPL-2.0
According to https://fedoraproject.org/wiki/Licensing:Main#Software_License_List
EPL-1.0 and EPL-2.0 are the short tags that should be used now.

2
0016-Add-support-for-prerelease-versions.patch
Unescape View File

@ -1,7 +1,7 @@
From 00c0c5cec90d5d6abbfd4acb2f5d65439b4bfd27 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sat, 26 Jan 2019 08:33:37 +0100
Subject: [PATCH 16/18] Add support for prerelease versions
Subject: [PATCH 16/19] Add support for prerelease versions
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---

2
0017-data-Cargo-doesn-t-escape-paths-with-space.patch
Unescape View File

@ -1,7 +1,7 @@
From 84a73bfa24ce11602a1f19554dc495125be4d0aa Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 17 Feb 2019 17:19:25 +0100
Subject: [PATCH 17/18] data: Cargo doesn't escape paths with space
Subject: [PATCH 17/19] data: Cargo doesn't escape paths with space
When building matrixmultiply v0.2.2:

26
0018-data-Escape-n-properly.patch
Unescape View File

@ -0,0 +1,26 @@
From 7f0a499ff3fca046869ab754151ae068903c4ab9 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sun, 10 Mar 2019 10:14:28 +0100
Subject: [PATCH 18/19] data: Escape `\n` properly
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
data/macros.cargo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/macros.cargo b/data/macros.cargo
index 9a375d0..96dc354 100644
--- a/data/macros.cargo
+++ b/data/macros.cargo
@@ -74,7 +74,7 @@ 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 -d '\n' %{__cp} --parents -a -t $REG_DIR \
+ %{__cargo} package -l | xargs -d '\\\n' %{__cp} --parents -a -t $REG_DIR \
%if ! %{with check} \
%{__cp} -a Cargo.toml.orig $REG_DIR/Cargo.toml \
%endif \
--
2.21.0

8
0018-Do-not-pull-optional-dependencies.patch → 0019-Do-not-pull-optional-dependencies.patch
Unescape View File

@ -1,7 +1,7 @@
From b0f34c2b6a7b8ca5b924e5c230f1271826114cb0 Mon Sep 17 00:00:00 2001
From ccc7ed42c168675efc4b9719dad12800b92450d5 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sat, 9 Mar 2019 22:04:49 +0100
Subject: [PATCH 18/18] Do not pull optional dependencies
Subject: [PATCH 19/19] Do not pull optional dependencies
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
@ -10,7 +10,7 @@ Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/data/macros.cargo b/data/macros.cargo
index 9a375d0..0e382c8 100644
index 96dc354..4e8f0c9 100644
--- a/data/macros.cargo
+++ b/data/macros.cargo
@@ -2,8 +2,10 @@
@ -34,7 +34,7 @@ index 9a375d0..0e382c8 100644
+# so that cargo doesn't fail resolving dependencies: \
+# https://github.com/rust-lang/cargo/pull/6729 \
+ %{__awk} -i inplace -v INPLACE_SUFFIX=.deps '/^\\\[((dev-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' Cargo.toml \
%{__cargo} package -l | xargs -d '\n' %{__cp} --parents -a -t $REG_DIR \
%{__cargo} package -l | xargs -d '\\\n' %{__cp} --parents -a -t $REG_DIR \
%if ! %{with check} \
%{__cp} -a Cargo.toml.orig $REG_DIR/Cargo.toml \
+%else \

10
rust-packaging.spec
Unescape View File

@ -5,7 +5,7 @@
Name: rust-packaging
Version: 6
Release: 23%{?dist}
Release: 24%{?dist}
Summary: RPM macros for building Rust packages on various architectures
License: MIT
@ -28,8 +28,9 @@ Patch0014: 0014-licensing-fix-zlib-license-translation.patch
Patch0015: 0015-licensing-rename-EPL-to-EPL-1.0-and-add-EPL-2.0.patch
Patch0016: 0016-Add-support-for-prerelease-versions.patch
Patch0017: 0017-data-Cargo-doesn-t-escape-paths-with-space.patch
# https://pagure.io/fedora-rust/rust2rpm/pull-request/68<Paste>
Patch0018: 0018-Do-not-pull-optional-dependencies.patch
Patch0018: 0018-data-Escape-n-properly.patch
# https://pagure.io/fedora-rust/rust2rpm/pull-request/68
Patch0019: 0019-Do-not-pull-optional-dependencies.patch
ExclusiveArch: %{rust_arches}
@ -90,6 +91,9 @@ py.test-%{python3_version} -vv test.py
%{python3_sitelib}/rust2rpm/
%changelog
* Sun Mar 10 2019 Igor Gnatenko <ignatnekobrain@fedoraproject.org> - 6-24
- Escape `\n` properly in macro file
* Sun Mar 10 2019 Igor Gnatenko <ignatnekobrain@fedoraproject.org> - 6-23
- Do not pull optional deps into BRs and trivial fixes

Write Preview
Loading…
Cancel
Save