diff --git a/LICENSE.dependencies b/LICENSE.dependencies deleted file mode 100644 index 2a0720c..0000000 --- a/LICENSE.dependencies +++ /dev/null @@ -1,114 +0,0 @@ -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-cexpr 0.6.0 -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-peeking_take_while 0.1.2 -ASL 2.0 or MIT: rust-rustc-hash 1.1.0 -ASL 2.0 or MIT: rust-wild 2.0.4 -ASL 2.0: rust-bytesize 1.1.0 -ASL 2.0: rust-clang-sys 1.3.3 -ASL 2.0: rust-line-wrap 0.1.1 -BSD: rust-bindgen 0.59.2 -BSD: rust-git-version 0.3.5 -BSD: rust-git-version-macro 0.3.5 -CC0: rust-encoding-index-japanese 1.20141219.5 -CC0: rust-encoding-index-korean 1.20141219.5 -CC0: rust-encoding-index-simpchinese 1.20141219.5 -CC0: rust-encoding-index-singlebyte 1.20141219.5 -CC0: rust-encoding-index-tradchinese 1.20141219.5 -LGPLv3+: rust-ansi_colours 1.1.1 -MIT and GPLv2 with exceptions and BSD: rust-libgit2-sys 0.13.4 -MIT or ASL 2.0 or zlib: rust-tinyvec_macros 0.1.0 -MIT or ASL 2.0: rust-base64 0.13.0 -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-bugreport 0.5.0 -MIT or ASL 2.0: rust-cc 1.0.73 -MIT or ASL 2.0: rust-cfg-if 1.0.0 -MIT or ASL 2.0: rust-clircle 0.3.0 -MIT or ASL 2.0: rust-content_inspector 0.2.4 -MIT or ASL 2.0: rust-crc32fast 1.3.2 -MIT or ASL 2.0: rust-dirs-next 2.0.0 -MIT or ASL 2.0: rust-dirs-sys-next 0.1.2 -MIT or ASL 2.0: rust-either 1.7.0 -MIT or ASL 2.0: rust-env_logger 0.9.0 -MIT or ASL 2.0: rust-flate2 1.0.22 -MIT or ASL 2.0: rust-form_urlencoded 1.0.1 -MIT or ASL 2.0: rust-git2 0.14.4 -MIT or ASL 2.0: rust-glob 0.3.0 -MIT or ASL 2.0: rust-hashbrown 0.12.3 -MIT or ASL 2.0: rust-humantime 2.1.0 -MIT or ASL 2.0: rust-idna 0.2.3 -MIT or ASL 2.0: rust-itoa 1.0.2 -MIT or ASL 2.0: rust-jobserver 0.1.24 -MIT or ASL 2.0: rust-lazy_static 1.4.0 -MIT or ASL 2.0: rust-lazycell 1.3.0 -MIT or ASL 2.0: rust-libc 0.2.126 -MIT or ASL 2.0: rust-libgit2-sys 0.13.4 -MIT or ASL 2.0: rust-libz-sys 1.1.8 -MIT or ASL 2.0: rust-linked-hash-map 0.5.6 -MIT or ASL 2.0: rust-log 0.4.17 -MIT or ASL 2.0: rust-minimal-lexical 0.2.1 -MIT or ASL 2.0: rust-num_threads 0.1.6 -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-pkg-config 0.3.25 -MIT or ASL 2.0: rust-proc-macro-hack 0.5.19 -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-regex 1.6.0 -MIT or ASL 2.0: rust-regex-syntax 0.6.27 -MIT or ASL 2.0: rust-safemem 0.3.3 -MIT or ASL 2.0: rust-semver 1.0.12 -MIT or ASL 2.0: rust-serde 1.0.139 -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-shell-escape 0.1.5 -MIT or ASL 2.0: rust-shell-words 1.1.0 -MIT or ASL 2.0: rust-shlex 1.1.0 -MIT or ASL 2.0: rust-syn 1.0.98 -MIT or ASL 2.0: rust-term_size 0.3.2 -MIT or ASL 2.0: rust-terminal_size 0.1.17 -MIT or ASL 2.0: rust-thiserror 1.0.31 -MIT or ASL 2.0: rust-thiserror-impl 1.0.31 -MIT or ASL 2.0: rust-time 0.3.11 -MIT or ASL 2.0: rust-unicode-bidi 0.3.8 -MIT or ASL 2.0: rust-unicode-ident 1.0.1 -MIT or ASL 2.0: rust-unicode-normalization 0.1.21 -MIT or ASL 2.0: rust-unicode-width 0.1.9 -MIT or ASL 2.0: rust-url 2.2.2 -MIT or ASL 2.0: rust-vec_map 0.8.2 -MIT or ASL 2.0: rust-yaml-rust 0.4.5 -MIT or zlib or ASL 2.0: rust-miniz_oxide 0.4.4 -MIT: rust-ansi_term 0.12.1 -MIT: rust-atty 0.2.14 -MIT: rust-bincode 1.3.3 -MIT: rust-clap2 2.34.0 -MIT: rust-console 0.15.0 -MIT: rust-encoding 0.2.33 -MIT: rust-matches 0.1.9 -MIT: rust-nom 7.1.1 -MIT: rust-onig 6.1.1 -MIT: rust-onig_sys 69.7.1 -MIT: rust-path-absolutize 3.0.11 -MIT: rust-path-dedot 3.0.14 -MIT: rust-plist 1.3.1 -MIT: rust-rgb 0.8.33 -MIT: rust-strsim 0.10.0 -MIT: rust-syntect 5.0.0 -MIT: rust-sys-info 0.9.1 -MIT: rust-textwrap0.11 0.11.0 -MIT: rust-which 4.2.5 -MIT: rust-xml-rs 0.8.4 -Unlicense or MIT: rust-aho-corasick 0.7.18 -Unlicense or MIT: rust-globset 0.4.8 -Unlicense or MIT: rust-grep-cli 0.1.6 -Unlicense or MIT: rust-memchr 2.5.0 -Unlicense or MIT: rust-regex-automata 0.1.10 -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 -zlib or ASL 2.0 or MIT: rust-bytemuck 1.10.0 -zlib or ASL 2.0 or MIT: rust-tinyvec 1.6.0 diff --git a/rust-bat.spec b/rust-bat.spec index 90b2ddd..e387651 100644 --- a/rust-bat.spec +++ b/rust-bat.spec @@ -1,27 +1,24 @@ -# Generated by rust2rpm 21 +# Generated by rust2rpm 23 %bcond_without check %global crate bat -Name: rust-%{crate} +Name: rust-bat Version: 0.21.0 Release: %autorelease Summary: Cat(1) clone with wings # Upstream license specification: MIT/Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/bat -Source0: %{crates_source} -Source1: LICENSE.dependencies -# Initial patched metadata +Source: %{crates_source} +# Manually created patch for downstream crate metadata changes # * Port from path_abs to path-absolutize: # https://github.com/sharkdp/bat/pull/1025 -Patch0: bat-fix-metadata.diff -Patch1: 0001-port-from-path_abs-to-path-absolutize.patch +Patch: bat-fix-metadata.diff +Patch: 0001-port-from-path_abs-to-path-absolutize.patch -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging >= 21 +BuildRequires: rust-packaging >= 23 %global _description %{expand: Cat(1) clone with wings.} @@ -303,14 +300,15 @@ use the "wild" feature of the "%{crate}" crate. %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 -cp %{SOURCE1} . %cargo_prep %generate_buildrequires -%cargo_generate_buildrequires +%cargo_generate_buildrequires -a %build %cargo_build +%cargo_license_summary +%{cargo_license} > LICENSE.dependencies %install %cargo_install @@ -329,9 +327,11 @@ install -Dpm0644 target/release/build/%{crate}-*/out/assets/completions/bat.fish %if %{with check} %check -%ifarch %{arm} +%ifarch %{arm} ppc64le # * doctests fail to compile on armv7hl with LLVM 14: # https://bugzilla.redhat.com/show_bug.cgi?id=2086106 +# * doctests fail to compile on ppc64le with LLVM 15: +# https://bugzilla.redhat.com/show_bug.cgi?id=2142648 %cargo_test -- --lib %else %cargo_test