rpms/rust-tokei
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to version 12.1.2; Fixes RHBZ#1910441

Browse Source
This commit is contained in:
Fabio Valentini 2022-07-27 12:08:48 +02:00
parent 0ac7157d22
commit c0d512986b
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
6 changed files with 147 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -18,3 +18,4 @@
/tokei-11.2.1.crate
/tokei-12.0.4.crate
/tokei-12.1.0.crate
/tokei-12.1.2.crate

102
LICENSE.dependencies Normal file
View File

@ -0,0 +1,102 @@
(ASL 2.0 or MIT) and BSD: rust-encoding_rs 0.8.31
(MIT or ASL 2.0) and Public Domain: rust-chrono-tz 0.5.3
ASL 2.0 or Boost: rust-ryu 1.0.10
ASL 2.0 or MIT: rust-autocfg 1.1.0
ASL 2.0 or MIT: rust-bytecount 0.6.3
ASL 2.0 or MIT: rust-fnv 1.0.7
ASL 2.0 or MIT: rust-indexmap 1.9.1
ASL 2.0 or MIT: rust-parking_lot0.11 0.11.2
ASL 2.0 or MIT: rust-parking_lot_core0.8 0.8.5
ASL 2.0 or MIT: rust-thread_local 1.1.4
BSD: rust-deunicode 1.3.1
BSD: rust-instant 0.1.12
MIT OR Apache-2.0: rust-term_size 0.3.2
MIT or ASL 2.0: rust-arrayvec0.5 0.5.2
MIT or ASL 2.0: rust-bitflags 1.3.2
MIT or ASL 2.0: rust-bstr 0.2.17
MIT or ASL 2.0: rust-cfg-if 1.0.0
MIT or ASL 2.0: rust-chrono 0.4.19
MIT or ASL 2.0: rust-crossbeam-channel 0.5.5
MIT or ASL 2.0: rust-crossbeam-deque 0.8.1
MIT or ASL 2.0: rust-crossbeam-epoch 0.9.9
MIT or ASL 2.0: rust-crossbeam-utils 0.8.10
MIT or ASL 2.0: rust-dirs-sys 0.3.7
MIT or ASL 2.0: rust-dirs3 3.0.2
MIT or ASL 2.0: rust-either 1.7.0
MIT or ASL 2.0: rust-encoding_rs_io 0.1.7
MIT or ASL 2.0: rust-env_logger0.8 0.8.4
MIT or ASL 2.0: rust-getrandom 0.2.7
MIT or ASL 2.0: rust-half 1.8.2
MIT or ASL 2.0: rust-hashbrown 0.12.3
MIT or ASL 2.0: rust-hex 0.4.3
MIT or ASL 2.0: rust-humansize 1.1.1
MIT or ASL 2.0: rust-humantime 2.1.0
MIT or ASL 2.0: rust-itoa 1.0.2
MIT or ASL 2.0: rust-itoa0.4 0.4.8
MIT or ASL 2.0: rust-lazy_static 1.4.0
MIT or ASL 2.0: rust-libc 0.2.126
MIT or ASL 2.0: rust-linked-hash-map 0.5.6
MIT or ASL 2.0: rust-lock_api 0.4.7
MIT or ASL 2.0: rust-log 0.4.17
MIT or ASL 2.0: rust-maplit 1.0.2
MIT or ASL 2.0: rust-memmap2 0.5.5
MIT or ASL 2.0: rust-num-format 0.4.0
MIT or ASL 2.0: rust-num-integer 0.1.45
MIT or ASL 2.0: rust-num-traits 0.2.15
MIT or ASL 2.0: rust-num_cpus 1.13.1
MIT or ASL 2.0: rust-once_cell 1.13.0
MIT or ASL 2.0: rust-percent-encoding 2.1.0
MIT or ASL 2.0: rust-pest 2.1.3
MIT or ASL 2.0: rust-pest_derive 2.1.0
MIT or ASL 2.0: rust-pest_generator 2.1.3
MIT or ASL 2.0: rust-pest_meta 2.1.3
MIT or ASL 2.0: rust-ppv-lite86 0.2.16
MIT or ASL 2.0: rust-proc-macro2 1.0.40
MIT or ASL 2.0: rust-quote 1.0.20
MIT or ASL 2.0: rust-rand 0.8.5
MIT or ASL 2.0: rust-rand_chacha 0.3.1
MIT or ASL 2.0: rust-rand_core 0.6.3
MIT or ASL 2.0: rust-rayon 1.5.3
MIT or ASL 2.0: rust-rayon-core 1.9.3
MIT or ASL 2.0: rust-regex 1.6.0
MIT or ASL 2.0: rust-regex-syntax 0.6.27
MIT or ASL 2.0: rust-scopeguard 1.1.0
MIT or ASL 2.0: rust-serde 1.0.139
MIT or ASL 2.0: rust-serde_cbor 0.11.2
MIT or ASL 2.0: rust-serde_derive 1.0.139
MIT or ASL 2.0: rust-serde_json 1.0.82
MIT or ASL 2.0: rust-serde_yaml 0.8.25
MIT or ASL 2.0: rust-slug 0.1.4
MIT or ASL 2.0: rust-smallvec 1.9.0
MIT or ASL 2.0: rust-syn 1.0.98
MIT or ASL 2.0: rust-toml 0.5.9
MIT or ASL 2.0: rust-ucd-trie 0.1.3
MIT or ASL 2.0: rust-unic-char-property 0.9.0
MIT or ASL 2.0: rust-unic-char-range 0.9.0
MIT or ASL 2.0: rust-unic-common 0.9.0
MIT or ASL 2.0: rust-unic-segment 0.9.0
MIT or ASL 2.0: rust-unic-ucd-segment 0.9.0
MIT or ASL 2.0: rust-unic-ucd-version 0.9.0
MIT or ASL 2.0: rust-unicode-ident 1.0.1
MIT or ASL 2.0: rust-unicode-width 0.1.9
MIT or ASL 2.0: rust-vec_map 0.8.2
MIT or ASL 2.0: rust-yaml-rust 0.4.5
MIT: rust-ansi_term 0.12.1
MIT: rust-atty 0.2.14
MIT: rust-clap2 2.34.0
MIT: rust-dashmap 4.0.2
MIT: rust-globwalk 0.8.1
MIT: rust-memoffset 0.6.5
MIT: rust-parse-zoneinfo 0.3.0
MIT: rust-strsim 0.10.0
MIT: rust-tera 1.12.1
MIT: rust-textwrap0.11 0.11.0
Unlicense or MIT: rust-aho-corasick 0.7.18
Unlicense or MIT: rust-globset 0.4.8
Unlicense or MIT: rust-grep-matcher 0.1.5
Unlicense or MIT: rust-grep-searcher 0.1.10
Unlicense or MIT: rust-ignore 0.4.18
Unlicense or MIT: rust-memchr 2.5.0
Unlicense or MIT: rust-same-file 1.0.6
Unlicense or MIT: rust-termcolor 1.1.3
Unlicense or MIT: rust-walkdir 2.3.2

84
rust-tokei.spec
View File

@ -1,37 +1,31 @@
# Generated by rust2rpm 16
# Generated by rust2rpm 22
%bcond_without check
%global crate tokei
Name: rust-%{crate}
Version: 12.0.4
Name: rust-tokei
Version: 12.1.2
Release: %autorelease
Summary: Utility that allows you to count code, quickly
Summary: Count your code, quickly
# Upstream license specification: MIT/Apache-2.0
License: MIT or ASL 2.0
License: MIT OR Apache-2.0
URL: https://crates.io/crates/tokei
Source: %{crates_source}
# Initial patched metadata
# * Bump to parking_lot 0.11, https://github.com/XAMPPRocky/tokei/pull/575
# * Bump to dashmap 4.0.1, https://github.com/XAMPPRocky/tokei/pull/680
Patch0: tokei-fix-metadata.diff
Source0: %{crates_source}
Source1: LICENSE.dependencies
ExclusiveArch: %{rust_arches}
%if %{__cargo_skip_build}
BuildArch: noarch
%endif
BuildRequires: rust-packaging
BuildRequires: rust-packaging >= 21
%global _description %{expand:
Utility that allows you to count code, quickly.}
Count your code, quickly.}
%description %{_description}
%if ! %{__cargo_skip_build}
%package -n %{crate}
Summary: %{summary}
# * (ASL 2.0 or MIT) and BSD
# * (MIT or ASL 2.0) and Public Domain
# * ASL 2.0 or Boost
# * ASL 2.0 or MIT
@ -40,13 +34,15 @@ Summary: %{summary}
# * MIT or ASL 2.0
# * Unlicense or MIT
License: MIT and BSD and (ASL 2.0 or Boost) and Public Domain
# LICENSE.dependencies contains a full license breakdown
%description -n %{crate} %{_description}
%files -n %{crate}
%license LICENCE-MIT LICENCE-APACHE
%license LICENCE-APACHE
%license LICENCE-MIT
%license LICENCE.dependencies
%{_bindir}/tokei
%endif
%package devel
Summary: %{summary}
@ -54,12 +50,13 @@ BuildArch: noarch
%description devel %{_description}
This package contains library source intended for building other packages
which use "%{crate}" crate.
This package contains library source intended for building other packages which
use the "%{crate}" crate.
%files devel
%license LICENCE-MIT LICENCE-APACHE
%{cargo_registry}/%{crate}-%{version_no_tilde}/
%license %{crate_instdir}/LICENCE-APACHE
%license %{crate_instdir}/LICENCE-MIT
%{crate_instdir}/
%package -n %{name}+default-devel
Summary: %{summary}
@ -67,11 +64,11 @@ BuildArch: noarch
%description -n %{name}+default-devel %{_description}
This package contains library source intended for building other packages
which use "default" feature of "%{crate}" crate.
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
%package -n %{name}+all-devel
Summary: %{summary}
@ -79,11 +76,11 @@ BuildArch: noarch
%description -n %{name}+all-devel %{_description}
This package contains library source intended for building other packages
which use "all" feature of "%{crate}" crate.
This package contains library source intended for building other packages which
use the "all" feature of the "%{crate}" crate.
%files -n %{name}+all-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+cbor-devel
Summary: %{summary}
@ -91,11 +88,11 @@ BuildArch: noarch
%description -n %{name}+cbor-devel %{_description}
This package contains library source intended for building other packages
which use "cbor" feature of "%{crate}" crate.
This package contains library source intended for building other packages which
use the "cbor" feature of the "%{crate}" crate.
%files -n %{name}+cbor-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+hex-devel
Summary: %{summary}
@ -103,11 +100,11 @@ BuildArch: noarch
%description -n %{name}+hex-devel %{_description}
This package contains library source intended for building other packages
which use "hex" feature of "%{crate}" crate.
This package contains library source intended for building other packages which
use the "hex" feature of the "%{crate}" crate.
%files -n %{name}+hex-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde_cbor-devel
Summary: %{summary}
@ -115,11 +112,11 @@ BuildArch: noarch
%description -n %{name}+serde_cbor-devel %{_description}
This package contains library source intended for building other packages
which use "serde_cbor" feature of "%{crate}" crate.
This package contains library source intended for building other packages which
use the "serde_cbor" feature of the "%{crate}" crate.
%files -n %{name}+serde_cbor-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+serde_yaml-devel
Summary: %{summary}
@ -127,11 +124,11 @@ BuildArch: noarch
%description -n %{name}+serde_yaml-devel %{_description}
This package contains library source intended for building other packages
which use "serde_yaml" feature of "%{crate}" crate.
This package contains library source intended for building other packages which
use the "serde_yaml" feature of the "%{crate}" crate.
%files -n %{name}+serde_yaml-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%ghost %{crate_instdir}/Cargo.toml
%package -n %{name}+yaml-devel
Summary: %{summary}
@ -139,14 +136,15 @@ BuildArch: noarch
%description -n %{name}+yaml-devel %{_description}
This package contains library source intended for building other packages
which use "yaml" feature of "%{crate}" crate.
This package contains library source intended for building other packages which
use the "yaml" feature of the "%{crate}" crate.
%files -n %{name}+yaml-devel
%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml
%ghost %{crate_instdir}/Cargo.toml
%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
cp %{SOURCE1} .
%cargo_prep
%generate_buildrequires

2
rust2rpm.conf Normal file
View File

@ -0,0 +1,2 @@
[DEFAULT]
all-features = true

2
sources
View File

@ -1 +1 @@
SHA512 (tokei-12.0.4.crate) = 2ae4acbf1238faddc494602f19b08c413eb5dab73fba9bc244aa9acdcda215221245f99a5556fcddbd127c4faffb23d4338e18ed3258231abd209908f051b744
SHA512 (tokei-12.1.2.crate) = b242f706230ed9b7c8cefa504f0067d3dd91b7aeadba0322d7c4ed79766e377273ff3c9183966a57ac40a6aa5903157b7b78e1acd778ba0326035c0667347024

20
tokei-fix-metadata.diff
View File

@ -1,20 +0,0 @@
--- tokei-12.0.4/Cargo.toml 2020-06-24T12:03:47+00:00
+++ tokei-12.0.4/Cargo.toml 2021-07-29T17:43:14.663987+00:00
@@ -37,7 +37,7 @@
version = "0.4.2"
[dependencies.dashmap]
-version = "3.11.4"
+version = "4.0.1"
features = ["serde"]
[dependencies.dirs]
@@ -67,7 +67,7 @@
version = "1.4.0"
[dependencies.parking_lot]
-version = "0.10.2"
+version = "0.11.0"
[dependencies.rayon]
version = "1.3.1"