From 83f02ed5b9837ce4011bed4f7367b42ab985373b Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 21 Jul 2022 11:17:14 +0200 Subject: [PATCH] Update to version 5.0.0; Fixes RHBZ#2081584 --- .gitignore | 1 + rust-syntect.spec | 204 ++++++++++++++++++++------------------ sources | 2 +- syntect-fix-metadata.diff | 13 +++ 4 files changed, 124 insertions(+), 96 deletions(-) create mode 100644 syntect-fix-metadata.diff diff --git a/.gitignore b/.gitignore index e517e58..765fcf9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /syntect-4.4.0.crate /syntect-4.5.0.crate /syntect-4.6.0.crate +/syntect-5.0.0.crate diff --git a/rust-syntect.spec b/rust-syntect.spec index 542b56d..fc1f3b1 100644 --- a/rust-syntect.spec +++ b/rust-syntect.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 18 +# Generated by rust2rpm 21 # * test data is not shipped with published crates %bcond_with check %global debug_package %{nil} @@ -6,7 +6,7 @@ %global crate syntect Name: rust-%{crate} -Version: 4.6.0 +Version: 5.0.0 Release: %autorelease Summary: Library for high quality syntax highlighting and code intelligence @@ -14,13 +14,13 @@ Summary: Library for high quality syntax highlighting and code intelligen License: MIT URL: https://crates.io/crates/syntect Source: %{crates_source} +# Initial patched metadata +# * drop unused, benchmark-only criterion dev-dependency to speed up builds +Patch0: syntect-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Library for high quality syntax highlighting and code intelligence using @@ -34,13 +34,15 @@ 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.txt -%doc Readme.md CHANGELOG.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE.txt +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/DESIGN.md +%doc %{crate_instdir}/Readme.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -48,23 +50,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 - -%package -n %{name}+assets-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+assets-devel %{_description} - -This package contains library source intended for building other packages -which use "assets" feature of "%{crate}" crate. - -%files -n %{name}+assets-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+bincode-devel Summary: %{summary} @@ -72,11 +62,11 @@ BuildArch: noarch %description -n %{name}+bincode-devel %{_description} -This package contains library source intended for building other packages -which use "bincode" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "bincode" feature of the "%{crate}" crate. %files -n %{name}+bincode-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+default-fancy-devel Summary: %{summary} @@ -84,11 +74,11 @@ BuildArch: noarch %description -n %{name}+default-fancy-devel %{_description} -This package contains library source intended for building other packages -which use "default-fancy" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default-fancy" feature of the "%{crate}" crate. %files -n %{name}+default-fancy-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+default-onig-devel Summary: %{summary} @@ -96,59 +86,59 @@ BuildArch: noarch %description -n %{name}+default-onig-devel %{_description} -This package contains library source intended for building other packages -which use "default-onig" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default-onig" feature of the "%{crate}" crate. %files -n %{name}+default-onig-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+dump-create-devel +%package -n %{name}+default-syntaxes-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+dump-create-devel %{_description} +%description -n %{name}+default-syntaxes-devel %{_description} -This package contains library source intended for building other packages -which use "dump-create" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default-syntaxes" feature of the "%{crate}" crate. -%files -n %{name}+dump-create-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+default-syntaxes-devel +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+dump-create-rs-devel +%package -n %{name}+default-themes-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+dump-create-rs-devel %{_description} +%description -n %{name}+default-themes-devel %{_description} -This package contains library source intended for building other packages -which use "dump-create-rs" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default-themes" feature of the "%{crate}" crate. -%files -n %{name}+dump-create-rs-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+default-themes-devel +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+dump-load-devel +%package -n %{name}+dump-create-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+dump-load-devel %{_description} +%description -n %{name}+dump-create-devel %{_description} -This package contains library source intended for building other packages -which use "dump-load" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "dump-create" feature of the "%{crate}" crate. -%files -n %{name}+dump-load-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+dump-create-devel +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+dump-load-rs-devel +%package -n %{name}+dump-load-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+dump-load-rs-devel %{_description} +%description -n %{name}+dump-load-devel %{_description} -This package contains library source intended for building other packages -which use "dump-load-rs" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "dump-load" feature of the "%{crate}" crate. -%files -n %{name}+dump-load-rs-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+dump-load-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+fancy-regex-devel Summary: %{summary} @@ -156,11 +146,11 @@ BuildArch: noarch %description -n %{name}+fancy-regex-devel %{_description} -This package contains library source intended for building other packages -which use "fancy-regex" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "fancy-regex" feature of the "%{crate}" crate. %files -n %{name}+fancy-regex-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+flate2-devel Summary: %{summary} @@ -168,11 +158,11 @@ BuildArch: noarch %description -n %{name}+flate2-devel %{_description} -This package contains library source intended for building other packages -which use "flate2" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "flate2" feature of the "%{crate}" crate. %files -n %{name}+flate2-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+fnv-devel Summary: %{summary} @@ -180,11 +170,11 @@ BuildArch: noarch %description -n %{name}+fnv-devel %{_description} -This package contains library source intended for building other packages -which use "fnv" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "fnv" feature of the "%{crate}" crate. %files -n %{name}+fnv-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+html-devel Summary: %{summary} @@ -192,11 +182,11 @@ BuildArch: noarch %description -n %{name}+html-devel %{_description} -This package contains library source intended for building other packages -which use "html" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "html" feature of the "%{crate}" crate. %files -n %{name}+html-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+metadata-devel Summary: %{summary} @@ -204,11 +194,11 @@ BuildArch: noarch %description -n %{name}+metadata-devel %{_description} -This package contains library source intended for building other packages -which use "metadata" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "metadata" feature of the "%{crate}" crate. %files -n %{name}+metadata-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+onig-devel Summary: %{summary} @@ -216,11 +206,11 @@ BuildArch: noarch %description -n %{name}+onig-devel %{_description} -This package contains library source intended for building other packages -which use "onig" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "onig" feature of the "%{crate}" crate. %files -n %{name}+onig-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+parsing-devel Summary: %{summary} @@ -228,11 +218,35 @@ BuildArch: noarch %description -n %{name}+parsing-devel %{_description} -This package contains library source intended for building other packages -which use "parsing" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "parsing" feature of the "%{crate}" crate. %files -n %{name}+parsing-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+plist-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+plist-devel %{_description} + +This package contains library source intended for building other packages which +use the "plist" feature of the "%{crate}" crate. + +%files -n %{name}+plist-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+plist-load-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+plist-load-devel %{_description} + +This package contains library source intended for building other packages which +use the "plist-load" feature of the "%{crate}" crate. + +%files -n %{name}+plist-load-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+regex-fancy-devel Summary: %{summary} @@ -240,11 +254,11 @@ BuildArch: noarch %description -n %{name}+regex-fancy-devel %{_description} -This package contains library source intended for building other packages -which use "regex-fancy" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "regex-fancy" feature of the "%{crate}" crate. %files -n %{name}+regex-fancy-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+regex-onig-devel Summary: %{summary} @@ -252,11 +266,11 @@ BuildArch: noarch %description -n %{name}+regex-onig-devel %{_description} -This package contains library source intended for building other packages -which use "regex-onig" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "regex-onig" feature of the "%{crate}" crate. %files -n %{name}+regex-onig-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+regex-syntax-devel Summary: %{summary} @@ -264,11 +278,11 @@ BuildArch: noarch %description -n %{name}+regex-syntax-devel %{_description} -This package contains library source intended for building other packages -which use "regex-syntax" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "regex-syntax" feature of the "%{crate}" crate. %files -n %{name}+regex-syntax-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+yaml-load-devel Summary: %{summary} @@ -276,11 +290,11 @@ BuildArch: noarch %description -n %{name}+yaml-load-devel %{_description} -This package contains library source intended for building other packages -which use "yaml-load" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "yaml-load" feature of the "%{crate}" crate. %files -n %{name}+yaml-load-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+yaml-rust-devel Summary: %{summary} @@ -288,11 +302,11 @@ BuildArch: noarch %description -n %{name}+yaml-rust-devel %{_description} -This package contains library source intended for building other packages -which use "yaml-rust" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "yaml-rust" feature of the "%{crate}" crate. %files -n %{name}+yaml-rust-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 diff --git a/sources b/sources index 6234d5b..eade0a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syntect-4.6.0.crate) = 9e320afaf4c2adf41dd7e20c5d95e3063fe8d2774d8deec7e0df3debab050e96a1a5c85d1732c661ee4022dc5bf1abfed2982f13269689b527f35efb2c82beba +SHA512 (syntect-5.0.0.crate) = b444424ad5f2ff9897707d6c2d0a39cf4e48a8d9a838286fc9f7bd9db6f1b4228bd2a5c985f5f88c014e75a7ee94bffdfee1cca45bd68e6db52e624e71923dc9 diff --git a/syntect-fix-metadata.diff b/syntect-fix-metadata.diff new file mode 100644 index 0000000..e7fafad --- /dev/null +++ b/syntect-fix-metadata.diff @@ -0,0 +1,13 @@ +--- syntect-5.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ syntect-5.0.0/Cargo.toml 2022-07-21T08:52:25.294808+00:00 +@@ -114,10 +114,6 @@ + version = "0.4.5" + optional = true + +-[dev-dependencies.criterion] +-version = "0.3" +-features = ["html_reports"] +- + [dev-dependencies.getopts] + version = "0.2" +