Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>epel9
Igor Gnatenko
6 years ago
parent
17a86d1495
commit
5955f7d37d
@ -0,0 +1,35 @@
|
|||||||
|
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
|
||||||
|
|
||||||
|
The file was mangled, and something about "teeworlds" was inserted
|
||||||
|
into the line for zlib. The spdx database doesn't list "teeworlds
|
||||||
|
license", so let's just remove that part.
|
||||||
|
Both [1] and [2] agree that "zlib" and "zlib license" are the same thing.
|
||||||
|
|
||||||
|
[1] https://spdx.org/licenses/Zlib
|
||||||
|
[2] https://fedoraproject.org/wiki/Licensing:Main#Good_Licenses
|
||||||
|
|
||||||
|
Fixes #61.
|
||||||
|
---
|
||||||
|
rust2rpm/spdx_to_fedora.csv | 3 +--
|
||||||
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/rust2rpm/spdx_to_fedora.csv b/rust2rpm/spdx_to_fedora.csv
|
||||||
|
index 829571a..1ca5a7e 100644
|
||||||
|
--- a/rust2rpm/spdx_to_fedora.csv
|
||||||
|
+++ b/rust2rpm/spdx_to_fedora.csv
|
||||||
|
@@ -306,8 +306,7 @@ Zed License,Zed,Zed,,,
|
||||||
|
Zend License v2.0,Zend-2.0,Zend,,,
|
||||||
|
Zimbra Public License v1.3,Zimbra-1.3,,,Fedora bad list,
|
||||||
|
Zimbra Public License v1.4,Zimbra-1.4,,,not on Fedora list,
|
||||||
|
-zlib License,Zlib,"zlib
|
||||||
|
-Teeworlds",,,Teeworlds License
|
||||||
|
+zlib License,Zlib,zlib,,,
|
||||||
|
zlib/libpng License with Acknowledgement,zlib-acknowledgement,zlib with acknowledgement,,,
|
||||||
|
Zope Public License 1.1,ZPL-1.1,,,This specific version not on Fedora list,
|
||||||
|
Zope Public License 2.0,ZPL-2.0,ZPLv2.0,,,
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
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
|
||||||
|
|
||||||
|
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.
|
||||||
|
(C.f. https://spdx.org/licenses/EPL-2.0.html.)
|
||||||
|
|
||||||
|
Fixes #64.
|
||||||
|
---
|
||||||
|
rust2rpm/spdx_to_fedora.csv | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/rust2rpm/spdx_to_fedora.csv b/rust2rpm/spdx_to_fedora.csv
|
||||||
|
index 1ca5a7e..c42e66e 100644
|
||||||
|
--- a/rust2rpm/spdx_to_fedora.csv
|
||||||
|
+++ b/rust2rpm/spdx_to_fedora.csv
|
||||||
|
@@ -112,7 +112,8 @@ DOC License,DOC,DOC,,,
|
||||||
|
Dotseqn License,Dotseqn,Dotseqn,,,
|
||||||
|
DSDP License,DSDP,DSDP,,,
|
||||||
|
dvipdfm License,dvipdfm,dvipdfm,,,
|
||||||
|
-Eclipse Public License 1.0,EPL-1.0,EPL,,,
|
||||||
|
+Eclipse Public License 1.0,EPL-1.0,EPL-1.0,,,
|
||||||
|
+Eclipse Public License 2.0,EPL-2.0,EPL-2.0,,,
|
||||||
|
Educational Community License v1.0,ECL-1.0,ECL 1.0,,,
|
||||||
|
Educational Community License v2.0,ECL-2.0,ECL 2.0,,,
|
||||||
|
eGenix.com Public License 1.1.0,eGenix,eGenix,,,
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
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
|
||||||
|
|
||||||
|
When building matrixmultiply v0.2.2:
|
||||||
|
|
||||||
|
BUILDSTDERR: /usr/bin/cp: cannot stat 'spare': No such file or directory
|
||||||
|
BUILDSTDERR: /usr/bin/cp: failed to get attributes of 'kernels': No such file or directory
|
||||||
|
|
||||||
|
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 9a9ce6a..9a375d0 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 %{__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
|
||||||
|
|
||||||
@ -0,0 +1,66 @@
|
|||||||
|
From b0f34c2b6a7b8ca5b924e5c230f1271826114cb0 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
|
||||||
|
|
||||||
|
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
|
||||||
|
---
|
||||||
|
data/macros.cargo | 13 +++++++++++--
|
||||||
|
rust2rpm/templates/main.spec | 5 -----
|
||||||
|
2 files changed, 11 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/data/macros.cargo b/data/macros.cargo
|
||||||
|
index 9a375d0..0e382c8 100644
|
||||||
|
--- a/data/macros.cargo
|
||||||
|
+++ b/data/macros.cargo
|
||||||
|
@@ -2,8 +2,10 @@
|
||||||
|
# https://github.com/rust-lang/cargo/issues/6397
|
||||||
|
# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
|
||||||
|
# it never writes to ~/.cargo during rpmbuild.
|
||||||
|
-%__cargo %{_bindir}/env CARGO_HOME=.cargo %{_bindir}/cargo
|
||||||
|
-%__cargo_common_opts %{?_smp_mflags}
|
||||||
|
+# We also need RUSTC_BOOTSTRAP since we use -Z avoid-dev-deps
|
||||||
|
+# until it gets stabilized: https://github.com/rust-lang/cargo/issues/5133
|
||||||
|
+%__cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 %{_bindir}/cargo
|
||||||
|
+%__cargo_common_opts %{?_smp_mflags} -Z avoid-dev-deps
|
||||||
|
%__cargo_inspector %{_bindir}/cargo-inspector
|
||||||
|
|
||||||
|
%cargo_registry %{_datadir}/cargo/registry
|
||||||
|
@@ -74,10 +76,17 @@ 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 \
|
||||||
|
+# Drop all dependency/features information \
|
||||||
|
+# 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 \
|
||||||
|
%if ! %{with check} \
|
||||||
|
%{__cp} -a Cargo.toml.orig $REG_DIR/Cargo.toml \
|
||||||
|
+%else \
|
||||||
|
+ %{__cp} -a Cargo.toml.deps $REG_DIR/Cargo.toml \
|
||||||
|
%endif \
|
||||||
|
+ %{__rm} $REG_DIR/Cargo.toml.{orig,deps} \
|
||||||
|
echo '{"files":{},"package":""}' > $REG_DIR/.cargo-checksum.json \
|
||||||
|
fi \
|
||||||
|
if %__cargo_is_bin; then \
|
||||||
|
diff --git a/rust2rpm/templates/main.spec b/rust2rpm/templates/main.spec
|
||||||
|
index 1ebef7b..f0c5445 100644
|
||||||
|
--- a/rust2rpm/templates/main.spec
|
||||||
|
+++ b/rust2rpm/templates/main.spec
|
||||||
|
@@ -44,12 +44,7 @@ Patch0: {{ patch_file }}
|
||||||
|
ExclusiveArch: %{rust_arches}
|
||||||
|
|
||||||
|
BuildRequires: rust-packaging
|
||||||
|
-{# We will put all non-optional and optional dependencies until
|
||||||
|
- https://github.com/rust-lang/cargo/issues/5133
|
||||||
|
- is solved
|
||||||
|
{% set buildrequires = normalize_deps(md.requires("default", resolve=True))|sort %}
|
||||||
|
-#}
|
||||||
|
-{% set buildrequires = normalize_deps(md.all_dependencies)|sort %}
|
||||||
|
{% for req in buildrequires %}
|
||||||
|
BuildRequires: {{ req }}
|
||||||
|
{% endfor %}
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
||||||
Loading…
Reference in new issue