diff --git a/.gitignore b/.gitignore index b3fc1dd..a488471 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /roff-0.1.0.crate +/roff-0.2.1.crate diff --git a/README.md b/README.md deleted file mode 100644 index 1a34c13..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-roff - -The rust-roff package \ No newline at end of file diff --git a/roff-duct-0.13.patch b/roff-duct-0.13.patch deleted file mode 100644 index 8e1d848..0000000 --- a/roff-duct-0.13.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up roff-0.1.0/tests/demo.rs.orig roff-0.1.0/tests/demo.rs ---- roff-0.1.0/tests/demo.rs.orig 2018-04-18 23:09:27.000000000 +0200 -+++ roff-0.1.0/tests/demo.rs 2019-09-27 12:45:29.912714021 +0200 -@@ -4,7 +4,7 @@ extern crate duct; - - fn roff_to_ascii(input: &str) -> String { - duct::cmd("troff", &["-a", "-mman"]) -- .input(input) -+ .stdin_bytes(input) - .stdout_capture() - .read() - .unwrap() diff --git a/roff-fix-metadata.diff b/roff-fix-metadata.diff deleted file mode 100644 index 6b85b90..0000000 --- a/roff-fix-metadata.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- roff-0.1.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ roff-0.1.0/Cargo.toml 2019-07-07T14:28:50.760316+00:00 -@@ -23,7 +23,7 @@ - - [dependencies] - [dev-dependencies.duct] --version = "0.10.0" -+version = "0.13.0" - - [dev-dependencies.pretty_assertions] --version = "0.5.1" -+version = "0.6.1" diff --git a/rust-roff.spec b/rust-roff.spec index 3213da4..0a3f57b 100644 --- a/rust-roff.spec +++ b/rust-roff.spec @@ -1,31 +1,19 @@ -# Generated by rust2rpm 10 +# Generated by rust2rpm 24 %bcond_without check %global debug_package %{nil} %global crate roff -Name: rust-%{crate} -Version: 0.1.0 +Name: rust-roff +Version: 0.2.1 Release: %autorelease -Summary: ROFF (man page format) generation library +Summary: (man page format) generation library -# Upstream license specification: MIT OR Apache-2.0 -License: MIT or ASL 2.0 +License: MIT OR Apache-2.0 URL: https://crates.io/crates/roff Source: %{crates_source} -# Initial patched metadata -# * Update duct to 0.13, pretty_assertions to 0.6, https://github.com/rust-cli/roff-rs/pull/8 -Patch0: roff-fix-metadata.diff -# Duct 0.13 compatibility: -# Renamed input to stdin_bytes -Patch1: roff-duct-0.13.patch - -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: ROFF (man page format) generation library.} @@ -38,13 +26,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 LICENSE-APACHE -%doc README.md -%{cargo_registry}/%{crate}-%{version}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -52,11 +41,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}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -64,9 +53,6 @@ which use "default" feature of "%{crate}" crate. %generate_buildrequires %cargo_generate_buildrequires -%if %{with check} -echo '/usr/bin/troff' -%endif %build %cargo_build diff --git a/sources b/sources index 6f1f10a..d81d1da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (roff-0.1.0.crate) = 8e9bfd3eb5b8bbfb3b0b417446c69e17b5104e31cd82e0616a246acc8d474a50622d66c5336a0584d57fe353b503a6ba01f1ffe64f6ff1bbe4cca3e9edada3b9 +SHA512 (roff-0.2.1.crate) = 001cbc21c5c8ca4362f91fb237b867966653e6f49fa20be1a6c3d3e8d9f2cca66c474eb0b59ecff1527c771554e8503cef94181295dcb007fbc1a50dab49ce0f