commit c2a225c8889b638344cb7a58254b0d57356106af Author: MSVSphere Packaging Team Date: Fri Dec 20 17:49:55 2024 +0300 import rust-terminal_size0.2-0.2.6-4.el10 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ead9466 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/terminal_size-0.2.6.crate diff --git a/.rust-terminal_size0.2.metadata b/.rust-terminal_size0.2.metadata new file mode 100644 index 0000000..84d5d47 --- /dev/null +++ b/.rust-terminal_size0.2.metadata @@ -0,0 +1 @@ +9277e78b2397f9faf3275abdf6c73b49b4427e1c SOURCES/terminal_size-0.2.6.crate diff --git a/SOURCES/0001-Port-from-rustix-0.37-to-0.38.patch b/SOURCES/0001-Port-from-rustix-0.37-to-0.38.patch new file mode 100644 index 0000000..6ec057c --- /dev/null +++ b/SOURCES/0001-Port-from-rustix-0.37-to-0.38.patch @@ -0,0 +1,25 @@ +From a47cd6fd89e913310bdca752ca6a69f53c140747 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Thu, 29 Aug 2024 16:21:45 +0200 +Subject: [PATCH] Port from rustix 0.37 to 0.38 + +--- + src/unix.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/unix.rs b/src/unix.rs +index 59af979..0a3de13 100644 +--- a/src/unix.rs ++++ b/src/unix.rs +@@ -6,7 +6,7 @@ use rustix::fd::BorrowedFd; + /// + /// If STDOUT is not a tty, returns `None` + pub fn terminal_size() -> Option<(Width, Height)> { +- terminal_size_using_fd(rustix::io::raw_stdout()) ++ terminal_size_using_fd(rustix::stdio::raw_stdout()) + } + + /// Returns the size of the terminal using the given file descriptor, if available. +-- +2.46.0 + diff --git a/SOURCES/rust2rpm.toml b/SOURCES/rust2rpm.toml new file mode 100644 index 0000000..88d8d33 --- /dev/null +++ b/SOURCES/rust2rpm.toml @@ -0,0 +1,9 @@ +[package] +cargo-toml-patch-comments = [ + "bump rustix dependency from 0.37 to 0.38", +] + +[tests] +skip = ["unix::compare_with_stty"] +comments = ["skip tests that don't work without a TTY"] + diff --git a/SOURCES/terminal_size-fix-metadata-auto.diff b/SOURCES/terminal_size-fix-metadata-auto.diff new file mode 100644 index 0000000..eb13059 --- /dev/null +++ b/SOURCES/terminal_size-fix-metadata-auto.diff @@ -0,0 +1,12 @@ +--- terminal_size-0.2.6/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ terminal_size-0.2.6/Cargo.toml 2024-08-29T14:23:13.991642+00:00 +@@ -31,9 +31,3 @@ + version = "0.37.0" + features = ["termios"] + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_Console", +-] diff --git a/SOURCES/terminal_size-fix-metadata.diff b/SOURCES/terminal_size-fix-metadata.diff new file mode 100644 index 0000000..bd7861a --- /dev/null +++ b/SOURCES/terminal_size-fix-metadata.diff @@ -0,0 +1,11 @@ +--- terminal_size-0.2.6/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ terminal_size-0.2.6/Cargo.toml 2024-08-29T14:23:25.182709+00:00 +@@ -28,6 +28,6 @@ + repository = "https://github.com/eminence/terminal-size" + + [target."cfg(not(windows))".dependencies.rustix] +-version = "0.37.0" +-features = ["termios"] ++version = "0.38.0" ++features = ["stdio", "termios"] + diff --git a/SPECS/rust-terminal_size0.2.spec b/SPECS/rust-terminal_size0.2.spec new file mode 100644 index 0000000..09166fd --- /dev/null +++ b/SPECS/rust-terminal_size0.2.spec @@ -0,0 +1,101 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.7.1) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 4; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +# Generated by rust2rpm 26 +%bcond_without check +%global debug_package %{nil} + +%global crate terminal_size + +Name: rust-terminal_size0.2 +Version: 0.2.6 +Release: %autorelease +Summary: Gets the size of your Linux or Windows terminal + +License: MIT OR Apache-2.0 +URL: https://crates.io/crates/terminal_size +Source: %{crates_source} +# Automatically generated patch to strip dependencies and normalize metadata +Patch: terminal_size-fix-metadata-auto.diff +# Manually created patch for downstream crate metadata changes +# * bump rustix dependency from 0.37 to 0.38 +Patch: terminal_size-fix-metadata.diff +Patch: 0001-Port-from-rustix-0.37-to-0.38.patch + +BuildRequires: cargo-rpm-macros >= 24 + +%global _description %{expand: +Gets the size of your Linux or Windows terminal.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/README.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +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 %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +# * skip tests that don't work without a TTY +%cargo_test -- -- --skip unix::compare_with_stty +%endif + +%changelog +* Fri Dec 20 2024 MSVSphere Packaging Team - 0.2.6-4 +- Rebuilt for MSVSphere 10 + +## START: Generated by rpmautospec +* Thu Aug 29 2024 Fabio Valentini - 0.2.6-4 +- Bump rustix dependency from 0.37 to 0.38 + +* Sat Jul 20 2024 Fedora Release Engineering - 0.2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Fabio Valentini - 0.2.6-1 +- Initial import (terminal_size 0.2 compat package) +## END: Generated by rpmautospec