From 36c34fec0ffce35c843fad8219571bffd2275dba Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 16 Jan 2020 12:34:05 -0800 Subject: [PATCH] Upgrade to criterion 0.3 and plist 0.5 --- rust-syntect.spec | 44 ++++++++++++++++++++++----------------- syntect-fix-metadata.diff | 20 ++++++++++++++++++ 2 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 syntect-fix-metadata.diff diff --git a/rust-syntect.spec b/rust-syntect.spec index 4f8b0ed..07ad543 100644 --- a/rust-syntect.spec +++ b/rust-syntect.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 10 +# Generated by rust2rpm 13 # * Missing testdata %bcond_with check %global debug_package %{nil} @@ -7,13 +7,16 @@ Name: rust-%{crate} Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for high quality syntax highlighting and code intelligence # Upstream license specification: MIT License: MIT URL: https://crates.io/crates/syntect Source: %{crates_source} +# Initial patched metadata +# * Upgrade to criterion 0.3 and plist 0.5, https://github.com/trishume/syntect/pull/277 +Patch0: syntect-fix-metadata.diff ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -40,7 +43,7 @@ which use "%{crate}" crate. %files devel %license LICENSE.txt %doc Readme.md DESIGN.md -%{cargo_registry}/%{crate}-%{version}/ +%{cargo_registry}/%{crate}-%{version_no_tilde}/ %package -n %{name}+default-devel Summary: %{summary} @@ -52,7 +55,7 @@ This package contains library source intended for building other packages which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+assets-devel Summary: %{summary} @@ -64,7 +67,7 @@ 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}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+bincode-devel Summary: %{summary} @@ -76,7 +79,7 @@ This package contains library source intended for building other packages which use "bincode" feature of "%{crate}" crate. %files -n %{name}+bincode-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+dump-create-devel Summary: %{summary} @@ -88,7 +91,7 @@ This package contains library source intended for building other packages which use "dump-create" feature of "%{crate}" crate. %files -n %{name}+dump-create-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+dump-create-rs-devel Summary: %{summary} @@ -100,7 +103,7 @@ This package contains library source intended for building other packages which use "dump-create-rs" feature of "%{crate}" crate. %files -n %{name}+dump-create-rs-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+dump-load-devel Summary: %{summary} @@ -112,7 +115,7 @@ This package contains library source intended for building other packages which use "dump-load" feature of "%{crate}" crate. %files -n %{name}+dump-load-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+dump-load-rs-devel Summary: %{summary} @@ -124,7 +127,7 @@ This package contains library source intended for building other packages which use "dump-load-rs" feature of "%{crate}" crate. %files -n %{name}+dump-load-rs-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+flate2-devel Summary: %{summary} @@ -136,7 +139,7 @@ This package contains library source intended for building other packages which use "flate2" feature of "%{crate}" crate. %files -n %{name}+flate2-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+fnv-devel Summary: %{summary} @@ -148,7 +151,7 @@ This package contains library source intended for building other packages which use "fnv" feature of "%{crate}" crate. %files -n %{name}+fnv-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+html-devel Summary: %{summary} @@ -160,7 +163,7 @@ This package contains library source intended for building other packages which use "html" feature of "%{crate}" crate. %files -n %{name}+html-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+metadata-devel Summary: %{summary} @@ -172,7 +175,7 @@ This package contains library source intended for building other packages which use "metadata" feature of "%{crate}" crate. %files -n %{name}+metadata-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+onig-devel Summary: %{summary} @@ -184,7 +187,7 @@ This package contains library source intended for building other packages which use "onig" feature of "%{crate}" crate. %files -n %{name}+onig-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+parsing-devel Summary: %{summary} @@ -196,7 +199,7 @@ This package contains library source intended for building other packages which use "parsing" feature of "%{crate}" crate. %files -n %{name}+parsing-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+regex-syntax-devel Summary: %{summary} @@ -208,7 +211,7 @@ This package contains library source intended for building other packages which use "regex-syntax" feature of "%{crate}" crate. %files -n %{name}+regex-syntax-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+yaml-load-devel Summary: %{summary} @@ -220,7 +223,7 @@ This package contains library source intended for building other packages which use "yaml-load" feature of "%{crate}" crate. %files -n %{name}+yaml-load-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+yaml-rust-devel Summary: %{summary} @@ -232,7 +235,7 @@ This package contains library source intended for building other packages which use "yaml-rust" feature of "%{crate}" crate. %files -n %{name}+yaml-rust-devel -%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -253,6 +256,9 @@ which use "yaml-rust" feature of "%{crate}" crate. %endif %changelog +* Thu Jan 16 2020 Josh Stone - 3.3.0-2 +- Upgrade to criterion 0.3 and plist 0.5 + * Thu Sep 26 13:15:19 CEST 2019 Igor Gnatenko - 3.3.0-1 - Update to 3.3.0 diff --git a/syntect-fix-metadata.diff b/syntect-fix-metadata.diff new file mode 100644 index 0000000..101c195 --- /dev/null +++ b/syntect-fix-metadata.diff @@ -0,0 +1,20 @@ +--- syntect-3.3.0/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ syntect-3.3.0/Cargo.toml 2020-01-16T20:29:16.728868+00:00 +@@ -62,7 +62,7 @@ + optional = true + + [dependencies.plist] +-version = "0.4" ++version = "0.5" + + [dependencies.regex-syntax] + version = "0.6" +@@ -84,7 +84,7 @@ + version = "0.4" + optional = true + [dev-dependencies.criterion] +-version = "0.2" ++version = "0.3" + + [dev-dependencies.getopts] + version = "0.2"