diff --git a/.gitignore b/.gitignore index dca0059..7361dda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /concolor-0.0.8.crate /concolor-0.0.11.crate +/concolor-0.1.1.crate diff --git a/concolor-doc-test-fix.patch b/concolor-doc-test-fix.patch deleted file mode 100644 index 2c02f47..0000000 --- a/concolor-doc-test-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur a/src/lib.rs b/src/lib.rs ---- a/src/lib.rs 1973-11-29 13:33:09.000000000 -0800 -+++ b/src/lib.rs 2022-07-10 21:46:46.592636461 -0700 -@@ -30,6 +30,7 @@ - //! If you are providing a command line option for controlling color, just call - //! ```rust - //! let when = concolor::ColorChoice::Always; -+//! #[cfg(feature = "api_unstable")] - //! concolor::set(when); - //! ``` - //! diff --git a/concolor-fix-metadata.diff b/concolor-fix-metadata.diff index 5eb56e2..0dc63ae 100644 --- a/concolor-fix-metadata.diff +++ b/concolor-fix-metadata.diff @@ -1,6 +1,6 @@ ---- concolor-0.0.11/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ concolor-0.0.11/Cargo.toml 2023-02-20T16:26:12.791792+00:00 -@@ -59,7 +59,6 @@ +--- concolor-0.1.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ concolor-0.1.1/Cargo.toml 2023-03-30T14:09:19.977543+00:00 +@@ -66,7 +66,6 @@ "clicolor", "no_color", "term", @@ -8,11 +8,11 @@ ] clicolor = [ "core", -@@ -82,7 +81,3 @@ +@@ -89,7 +88,3 @@ "core", - "concolor-query", + "dep:concolor-query", ] -windows = [ - "core", -- "concolor-query/windows", +- "dep:concolor-query", -] diff --git a/rust-concolor.spec b/rust-concolor.spec index 202e9cd..18c3e76 100644 --- a/rust-concolor.spec +++ b/rust-concolor.spec @@ -5,7 +5,7 @@ %global crate concolor Name: rust-concolor -Version: 0.0.11 +Version: 0.1.1 Release: %autorelease Summary: Control console coloring across all dependencies @@ -15,8 +15,6 @@ Source: %{crates_source} # Manually created patch for downstream crate metadata changes # * remove Windows-specific features Patch: concolor-fix-metadata.diff -# * fix missing cfg-gate for a doctest -Patch: concolor-doc-test-fix.patch BuildRequires: cargo-rpm-macros >= 24 @@ -52,16 +50,16 @@ use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+api_unstable-devel +%package -n %{name}+api-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+api_unstable-devel %{_description} +%description -n %{name}+api-devel %{_description} This package contains library source intended for building other packages which -use the "api_unstable" feature of the "%{crate}" crate. +use the "api" feature of the "%{crate}" crate. -%files -n %{name}+api_unstable-devel +%files -n %{name}+api-devel %ghost %{crate_instdir}/Cargo.toml %package -n %{name}+auto-devel @@ -76,18 +74,6 @@ use the "auto" feature of the "%{crate}" crate. %files -n %{name}+auto-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+bitflags-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+bitflags-devel %{_description} - -This package contains library source intended for building other packages which -use the "bitflags" feature of the "%{crate}" crate. - -%files -n %{name}+bitflags-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+clicolor-devel Summary: %{summary} BuildArch: noarch @@ -100,18 +86,6 @@ use the "clicolor" feature of the "%{crate}" crate. %files -n %{name}+clicolor-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+concolor-query-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+concolor-query-devel %{_description} - -This package contains library source intended for building other packages which -use the "concolor-query" feature of the "%{crate}" crate. - -%files -n %{name}+concolor-query-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+core-devel Summary: %{summary} BuildArch: noarch @@ -177,17 +151,17 @@ use the "term" feature of the "%{crate}" crate. %cargo_prep %generate_buildrequires -%cargo_generate_buildrequires +%cargo_generate_buildrequires -f api %build -%cargo_build +%cargo_build -f api %install -%cargo_install +%cargo_install -f api %if %{with check} %check -%cargo_test +%cargo_test -f api %endif %changelog diff --git a/rust2rpm.conf b/rust2rpm.conf new file mode 100644 index 0000000..6767530 --- /dev/null +++ b/rust2rpm.conf @@ -0,0 +1,3 @@ +[DEFAULT] +enabled-features = + api diff --git a/sources b/sources index e28018f..25a1204 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (concolor-0.0.11.crate) = e54ad64c3c08d5bd48882014078bb94feb297b747059a6443cb3030fc3256ae63bd8b623adf2a767aca736a73718a753de90fbaad274117c13939c1253d4e73e +SHA512 (concolor-0.1.1.crate) = 3cfee7d0094c4f9f36ae11ac0492e7dd94308d756e01a85cac879001280117621dd366ae8487e960258a39fe8569bf25aa5700f513a60542d12367f16f9bc2ac