Update to version 4.0.6; Fixes RHBZ#2005911

2022-07-26 18:42:26 +02:00 · 2022-07-26 18:42:26 +02:00 · 2e3f844899
commit 2e3f844899
parent e921ca23eb
5 changed files with 145 additions and 30 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,4 @@
 /jql-2.7.4.crate
 /jql-2.9.4.crate
 /jql-2.9.5.crate
+/jql-4.0.6.crate
--- a/LICENSE.dependencies
+++ b/LICENSE.dependencies
@ -0,0 +1,74 @@
+ASL 2.0 or Boost: rust-ryu 1.0.10
+ASL 2.0 or MIT: rust-async-channel 1.6.1
+ASL 2.0 or MIT: rust-async-executor 1.4.1
+ASL 2.0 or MIT: rust-async-global-executor 2.2.0
+ASL 2.0 or MIT: rust-async-io 1.7.0
+ASL 2.0 or MIT: rust-async-lock 2.5.0
+ASL 2.0 or MIT: rust-async-process 1.4.0
+ASL 2.0 or MIT: rust-async-std 1.12.0
+ASL 2.0 or MIT: rust-async-task 4.3.0
+ASL 2.0 or MIT: rust-atomic-waker 1.0.0
+ASL 2.0 or MIT: rust-autocfg 1.1.0
+ASL 2.0 or MIT: rust-blocking 1.2.0
+ASL 2.0 or MIT: rust-cache-padded 1.2.0
+ASL 2.0 or MIT: rust-concurrent-queue 1.2.3
+ASL 2.0 or MIT: rust-ctor 0.1.22
+ASL 2.0 or MIT: rust-event-listener 2.5.2
+ASL 2.0 or MIT: rust-fastrand 1.7.0
+ASL 2.0 or MIT: rust-futures-lite 1.12.0
+ASL 2.0 or MIT: rust-indexmap 1.9.1
+ASL 2.0 or MIT: rust-parking 2.0.0
+ASL 2.0 or MIT: rust-pin-project-lite 0.2.9
+ASL 2.0 or MIT: rust-polling 2.2.0
+ASL 2.0 or MIT: rust-signal-hook 0.3.14
+ASL 2.0 or MIT: rust-signal-hook-registry 1.4.0
+ASL 2.0 or MIT: rust-value-bag 1.0.0~alpha.9
+ASL 2.0 or MIT: rust-waker-fn 1.1.0
+EPL-2.0: rust-colored_json 2.1.0
+MIT OR Apache-2.0: rust-clap 3.2.12
+MIT OR Apache-2.0: rust-clap_lex 0.2.4
+MIT or ASL 2.0: rust-anyhow 1.0.58
+MIT or ASL 2.0: rust-async-attributes 1.1.2
+MIT or ASL 2.0: rust-bitflags 1.3.2
+MIT or ASL 2.0: rust-cfg-if 1.0.0
+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-either 1.7.0
+MIT or ASL 2.0: rust-futures-core 0.3.21
+MIT or ASL 2.0: rust-futures-io 0.3.21
+MIT or ASL 2.0: rust-hashbrown 0.12.3
+MIT or ASL 2.0: rust-itoa 1.0.2
+MIT or ASL 2.0: rust-kv-log-macro 1.0.7
+MIT or ASL 2.0: rust-libc 0.2.126
+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-num_cpus 1.13.1
+MIT or ASL 2.0: rust-once_cell 1.13.0
+MIT or ASL 2.0: rust-os_str_bytes 6.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-pin-utils 0.1.0
+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-rayon 1.5.3
+MIT or ASL 2.0: rust-rayon-core 1.9.3
+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_json 1.0.82
+MIT or ASL 2.0: rust-socket2 0.4.4
+MIT or ASL 2.0: rust-syn 1.0.98
+MIT or ASL 2.0: rust-ucd-trie 0.1.3
+MIT or ASL 2.0: rust-unicode-ident 1.0.1
+MIT or ASL 2.0: rust-version_check 0.9.4
+MIT: rust-ansi_term 0.12.1
+MIT: rust-atty 0.2.14
+MIT: rust-memoffset 0.6.5
+MIT: rust-slab 0.4.7
+MIT: rust-strsim 0.10.0
+MIT: rust-textwrap 0.15.0
+Unlicense or MIT: rust-memchr 2.5.0
+Unlicense or MIT: rust-termcolor 1.1.3
--- a/jql-fix-metadata.diff
+++ b/jql-fix-metadata.diff
@ -1,8 +1,12 @@
--- jql-2.9.5/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ jql-2.9.5/Cargo.toml	2021-08-24T12:23:06.300270+00:00
-@@ -66,5 +66,3 @@
- version = "1.0.66"
- features = ["preserve_order"]
+--- jql-4.0.6/Cargo.toml	1970-01-01T00:00:01+00:00
+++ jql-4.0.6/Cargo.toml	2022-07-26T16:25:05.056923+00:00
+@@ -98,9 +98,6 @@
+ ]
 default-features = false
+ 
 -[dev-dependencies.criterion]
-version = "0.3.5"
+-version = "0.3.6"
+-
+ [features]
+ default = [
+     "async-std",
--- a/rust-jql.spec
+++ b/rust-jql.spec
@ -1,34 +1,30 @@
-# Generated by rust2rpm 18
+# Generated by rust2rpm 22
 %bcond_without check

 %global crate jql

-Name:           rust-%{crate}
-Version:        2.9.5
+Name:           rust-jql
+Version:        4.0.6
 Release:        %autorelease
 Summary:        JSON query language CLI tool

-# Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/jql
-Source:         %{crates_source}
-# Initial patched metadata
-# * drop criterion dev-dependency (only used by benchmarks)
-Patch0:         jql-fix-metadata.diff
+Source0:        %{crates_source}
+Source1:        LICENSE.dependencies
+# Manually created patch for downstream crate metadata changes
+# * drop unused, benchmark-only criterion dev-dependency to speed up builds
+Patch:          jql-fix-metadata.diff

 ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif

-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21

 %global _description %{expand:
 JSON query language CLI tool.}

 %description %{_description}

-%if ! %{__cargo_skip_build}
 %package     -n %{crate}
 Summary:        %{summary}
 # ASL 2.0 or Boost
@ -38,14 +34,16 @@ Summary:        %{summary}
 # MIT or ASL 2.0
 # Unlicense or MIT
 License:        MIT and EPL-2.0 and (ASL 2.0 or Boost)
+# LICENSE.dependencies contains a full license breakdown

 %description -n %{crate} %{_description}

 %files       -n %{crate}
 %license LICENSE-MIT
-%doc README.md PERFORMANCE.md
+%license LICENSE.dependencies
+%doc PERFORMANCE.md
+%doc README.md
 %{_bindir}/jql
-%endif

 %package        devel
 Summary:        %{summary}
@ -53,13 +51,14 @@ 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 LICENSE-MIT
-%doc README.md PERFORMANCE.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%license %{crate_instdir}/LICENSE-MIT
+%doc %{crate_instdir}/PERFORMANCE.md
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/

 %package     -n %{name}+default-devel
 Summary:        %{summary}
@ -67,14 +66,51 @@ 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}+async-std-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+async-std-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "async-std" feature of the "%{crate}" crate.
+
+%files       -n %{name}+async-std-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+clap-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+clap-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "clap" feature of the "%{crate}" crate.
+
+%files       -n %{name}+clap-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+colored_json-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+colored_json-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "colored_json" feature of the "%{crate}" crate.
+
+%files       -n %{name}+colored_json-devel
+%ghost %{crate_instdir}/Cargo.toml

 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
+cp %{SOURCE1} .
 %cargo_prep

 %generate_buildrequires
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (jql-2.9.5.crate) = 22621278fea622ca405763d63dc3799c28ade663a5e3c919daee3adfb08326077ad259f36241a7378d7805cb01aa3ce9fbcad8564c6f5587f5cd1cde38f37f47
+SHA512 (jql-4.0.6.crate) = 37cd5c5b7eedf394d56a2b943d1b37ae545f8e85da9a7bcb5f59b126d5c667201d69d905725e6ec0169c9c637d2a44bcfba6189bbe52901d3cc7ea930a78d360