diff --git a/.gitignore b/.gitignore index 28a12bd..83e793a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /cargo-c-0.7.3+cargo-0.51.crate /cargo-c-0.9.2+cargo-0.55.crate /cargo-c-0.9.7+cargo-0.59.crate +/cargo-c-0.9.12+cargo-0.64.crate diff --git a/LICENSE.dependencies b/LICENSE.dependencies new file mode 100644 index 0000000..3d583d9 --- /dev/null +++ b/LICENSE.dependencies @@ -0,0 +1,111 @@ +(MIT OR Apache-2.0) AND Unicode-DFS-2016: unicode-ident v1.0.3 +Apache-2.0 OR BSL-1.0: ryu v1.0.11 +Apache-2.0 OR MIT: fastrand v1.8.0 +Apache-2.0 OR MIT: fnv v1.0.7 +Apache-2.0 OR MIT: indexmap v1.9.1 +Apache-2.0 OR MIT: rustfix v0.6.1 +Apache-2.0 OR MIT: strip-ansi-escapes v0.1.1 +Apache-2.0 OR MIT: thread_local v1.1.4 +Apache-2.0 OR MIT: utf8parse v0.2.0 +Apache-2.0 OR MIT: vte v0.10.1 +Apache-2.0: bytesize v1.1.0 +Apache-2.0: openssl v0.10.41 +MIT AND GPL-2.0-only WITH GCC-exception-2.0 AND BSD-3-Clause: libgit2-sys v0.13.4 +MIT OR Apache-2.0 OR Zlib: tinyvec_macros v0.1.0 +MIT OR Apache-2.0: anyhow v1.0.61 +MIT OR Apache-2.0: arrayvec v0.5.2 +MIT OR Apache-2.0: bitflags v1.3.2 +MIT OR Apache-2.0: bstr v0.2.17 +MIT OR Apache-2.0: cargo v0.64.0 +MIT OR Apache-2.0: cargo-platform v0.1.2 +MIT OR Apache-2.0: cargo-util v0.2.1 +MIT OR Apache-2.0: cc v1.0.73 +MIT OR Apache-2.0: cfg-if v1.0.0 +MIT OR Apache-2.0: clap v3.2.17 +MIT OR Apache-2.0: clap_lex v0.2.4 +MIT OR Apache-2.0: crates-io v0.34.0 +MIT OR Apache-2.0: crc32fast v1.3.2 +MIT OR Apache-2.0: crossbeam-utils v0.8.11 +MIT OR Apache-2.0: either v1.8.0 +MIT OR Apache-2.0: env_logger v0.9.0 +MIT OR Apache-2.0: filetime v0.2.17 +MIT OR Apache-2.0: flate2 v1.0.24 +MIT OR Apache-2.0: foreign-types v0.3.2 +MIT OR Apache-2.0: foreign-types-shared v0.1.1 +MIT OR Apache-2.0: form_urlencoded v1.0.1 +MIT OR Apache-2.0: git2 v0.14.4 +MIT OR Apache-2.0: git2-curl v0.15.0 +MIT OR Apache-2.0: glob v0.3.0 +MIT OR Apache-2.0: hashbrown v0.12.3 +MIT OR Apache-2.0: heck v0.4.0 +MIT OR Apache-2.0: hex v0.4.3 +MIT OR Apache-2.0: home v0.5.3 +MIT OR Apache-2.0: humantime v2.1.0 +MIT OR Apache-2.0: idna v0.2.3 +MIT OR Apache-2.0: itertools v0.10.3 +MIT OR Apache-2.0: itoa v1.0.3 +MIT OR Apache-2.0: jobserver v0.1.24 +MIT OR Apache-2.0: kstring v2.0.0 +MIT OR Apache-2.0: lazy_static v1.4.0 +MIT OR Apache-2.0: lazycell v1.3.0 +MIT OR Apache-2.0: libc v0.2.131 +MIT OR Apache-2.0: libssh2-sys v0.2.23 +MIT OR Apache-2.0: libz-sys v1.1.8 +MIT OR Apache-2.0: log v0.4.17 +MIT OR Apache-2.0: num_cpus v1.13.1 +MIT OR Apache-2.0: once_cell v1.13.1 +MIT OR Apache-2.0: opener v0.5.0 +MIT OR Apache-2.0: openssl-probe v0.1.5 +MIT OR Apache-2.0: os_str_bytes v6.3.0 +MIT OR Apache-2.0: pathdiff v0.2.1 +MIT OR Apache-2.0: percent-encoding v2.1.0 +MIT OR Apache-2.0: proc-macro2 v1.0.43 +MIT OR Apache-2.0: quote v1.0.21 +MIT OR Apache-2.0: rand_core v0.6.3 +MIT OR Apache-2.0: rand_xoshiro v0.6.0 +MIT OR Apache-2.0: regex v1.6.0 +MIT OR Apache-2.0: regex-syntax v0.6.27 +MIT OR Apache-2.0: remove_dir_all v0.7.0 +MIT OR Apache-2.0: semver v1.0.13 +MIT OR Apache-2.0: serde v1.0.144 +MIT OR Apache-2.0: serde_ignored v0.1.5 +MIT OR Apache-2.0: serde_json v1.0.85 +MIT OR Apache-2.0: shell-escape v0.1.5 +MIT OR Apache-2.0: socket2 v0.4.4 +MIT OR Apache-2.0: static_assertions v1.1.0 +MIT OR Apache-2.0: syn v1.0.99 +MIT OR Apache-2.0: tar v0.4.38 +MIT OR Apache-2.0: tempfile v3.3.0 +MIT OR Apache-2.0: toml v0.5.9 +MIT OR Apache-2.0: toml_edit v0.14.4 +MIT OR Apache-2.0: typenum v1.15.0 +MIT OR Apache-2.0: unicode-bidi v0.3.8 +MIT OR Apache-2.0: unicode-normalization v0.1.21 +MIT OR Apache-2.0: unicode-width v0.1.9 +MIT OR Apache-2.0: unicode-xid v0.2.3 +MIT OR Apache-2.0: url v2.2.2 +MIT: atty v0.2.14 +MIT: bytes v1.2.1 +MIT: cargo-c v0.9.12 +MIT: combine v4.6.6 +MIT: crypto-hash v0.3.4 +MIT: curl v0.4.44 +MIT: curl-sys v0.4.56 +MIT: matches v0.1.9 +MIT: openssl-sys v0.9.75 +MIT: os_info v3.5.0 +MIT: strsim v0.10.0 +MIT: textwrap v0.15.0 +MPL-2.0+: bitmaps v2.1.0 +MPL-2.0+: im-rc v15.1.0 +MPL-2.0+: sized-chunks v0.6.5 +MPL-2.0: cbindgen v0.24.3 +Unlicense OR MIT: aho-corasick v0.7.18 +Unlicense OR MIT: globset v0.4.9 +Unlicense OR MIT: ignore v0.4.18 +Unlicense OR MIT: memchr v2.5.0 +Unlicense OR MIT: regex-automata v0.1.10 +Unlicense OR MIT: same-file v1.0.6 +Unlicense OR MIT: termcolor v1.1.3 +Unlicense OR MIT: walkdir v2.3.2 +Zlib OR Apache-2.0 OR MIT: tinyvec v1.6.0 diff --git a/cargo-c-fix-metadata.diff b/cargo-c-fix-metadata.diff index 68c1aa8..1929a39 100644 --- a/cargo-c-fix-metadata.diff +++ b/cargo-c-fix-metadata.diff @@ -1,15 +1,15 @@ ---- cargo-c-0.9.7+cargo-0.59/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ cargo-c-0.9.7+cargo-0.59/Cargo.toml 2022-02-21T22:57:44.956166+00:00 +--- cargo-c-0.9.12+cargo-0.64/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ cargo-c-0.9.12+cargo-0.64/Cargo.toml 2022-08-25T10:44:01.925899+00:00 @@ -12,7 +12,7 @@ [package] edition = "2021" name = "cargo-c" --version = "0.9.7+cargo-0.59" -+version = "0.9.7" +-version = "0.9.12+cargo-0.64" ++version = "0.9.12" authors = ["Luca Barbato "] description = "Helper program to build and install c-like libraries" readme = "README.md" -@@ -85,4 +85,3 @@ +@@ -96,4 +96,3 @@ [features] default = [] diff --git a/rust-cargo-c.spec b/rust-cargo-c.spec index 18d1c2a..230a348 100644 --- a/rust-cargo-c.spec +++ b/rust-cargo-c.spec @@ -1,28 +1,29 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 22 %bcond_without check +# reduce debuginfo verbosity to work around OOM problems on 32-bit arches %global rustflags_debuginfo 1 %global crate cargo-c -%global upstream_version 0.9.7+cargo-0.59 +%global upstream_version 0.9.12+cargo-0.64 -Name: rust-%{crate} -Version: 0.9.7 +Name: rust-cargo-c +Version: 0.9.12 Release: %autorelease Summary: Helper program to build and install c-like libraries -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/cargo-c -Source: %{crates_source %{crate} %{upstream_version}} -# Initial patched metadata +Source0: %{crates_source %{crate} %{upstream_version}} +Source1: LICENSE.dependencies +# Manually created patch for downstream crate metadata changes # * drop +cargo version suffix from crate version # * remove vendored OpenSSL feature -Patch0: cargo-c-fix-metadata.diff +Patch: cargo-c-fix-metadata.diff ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging >= 21-2 +BuildRequires: rust-packaging >= 21 %global _description %{expand: Helper program to build and install c-like libraries.} @@ -31,26 +32,31 @@ Helper program to build and install c-like libraries.} %package -n %{crate} Summary: %{summary} -# ASL 2.0 -# ASL 2.0 or Boost -# ASL 2.0 or MIT +# (MIT OR Apache-2.0) AND Unicode-DFS-2016 +# Apache-2.0 +# Apache-2.0 OR BSL-1.0 +# Apache-2.0 OR MIT # MIT -# MIT or ASL 2.0 -# MIT or ASL 2.0 or zlib -# MPLv2.0 -# Unlicense or MIT -# zlib or ASL 2.0 or MIT -License: MIT and ASL 2.0 and MPLv2.0 +# MIT AND GPL-2.0-only WITH GCC-exception-2.0 AND BSD-3-Clause +# MIT OR Apache-2.0 +# MIT OR Apache-2.0 OR Zlib +# MPL-2.0 +# MPL-2.0+ +# Unlicense OR MIT +# Zlib OR Apache-2.0 OR MIT +License: MIT AND Apache-2.0 AND BSD-3-Clause AND GPL-2.0-only WITH GCC-exception-2.0 AND MPL-2.0 AND Unicode-DFS-2016 +# LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} %files -n %{crate} %license LICENSE +%license LICENSE.dependencies %doc README.md -%{_bindir}/cargo-ctest %{_bindir}/cargo-capi -%{_bindir}/cargo-cinstall %{_bindir}/cargo-cbuild +%{_bindir}/cargo-cinstall +%{_bindir}/cargo-ctest %package devel Summary: %{summary} @@ -62,9 +68,9 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE -%doc README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -76,10 +82,11 @@ This package contains library source intended for building other packages which use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{upstream_version} -p1 +cp -pav %{SOURCE1} . %cargo_prep %generate_buildrequires diff --git a/sources b/sources index 97b8cae..aa7dd99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cargo-c-0.9.7+cargo-0.59.crate) = d4f44c41a42ee509588e5d5276a32309e0beda09097b74822615c06fd9f5e901c77d6692461c562b82280686a4dc24af6b318764a0bc68873f76bedb048e5fcd +SHA512 (cargo-c-0.9.12+cargo-0.64.crate) = 06f8c86f6d8eab6e30bc720c133c796ef28d991e598d309795b1075434c4780b2df2fab307aeb10f04a782d1480c25547a5bf61ec1e6cf8eac6d92e02ed34c9c