From dc06a48c1a06a375e0a735196724012c2696229c Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 8 Feb 2022 00:40:44 +0100 Subject: [PATCH 2/5] Update to version 0.2.2; Fixes RHBZ#2051103 --- .gitignore | 1 + libm-fix-metadata.diff | 8 ++++---- rust-libm.spec | 16 ++++++---------- sources | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index e0c1d17..eb7e0d0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /libm-0.1.3.crate /libm-0.1.4.crate /libm-0.2.1.crate +/libm-0.2.2.crate diff --git a/libm-fix-metadata.diff b/libm-fix-metadata.diff index 85072b0..cab7804 100644 --- a/libm-fix-metadata.diff +++ b/libm-fix-metadata.diff @@ -1,10 +1,10 @@ ---- libm-0.2.1/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ libm-0.2.1/Cargo.toml 2019-11-28T14:17:50.762271+00:00 +--- libm-0.2.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ libm-0.2.2/Cargo.toml 2022-02-07T22:51:18.738558+00:00 @@ -21,6 +21,7 @@ categories = ["no-std"] license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/libm" +exclude = ["/ci/*"] + [profile.release] + lto = "fat" [dev-dependencies.no-panic] - version = "0.1.8" - [build-dependencies.rand] diff --git a/rust-libm.spec b/rust-libm.spec index a2e8efc..1fa8835 100644 --- a/rust-libm.spec +++ b/rust-libm.spec @@ -1,12 +1,11 @@ -# Generated by rust2rpm 19 -# no-panic fails: https://github.com/rust-lang/libm/issues/234 -%bcond_with check +# Generated by rust2rpm 20 +%bcond_without check %global debug_package %{nil} %global crate libm Name: rust-%{crate} -Version: 0.2.1 +Version: 0.2.2 Release: %autorelease Summary: Libm in pure Rust @@ -19,9 +18,6 @@ Source: %{crates_source} Patch0: libm-fix-metadata.diff ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif BuildRequires: rust-packaging @@ -37,7 +33,7 @@ BuildArch: noarch %description devel %{_description} This package contains library source intended for building other packages which -use "%{crate}" crate. +use the "%{crate}" crate. %files devel %license LICENSE-APACHE LICENSE-MIT @@ -51,7 +47,7 @@ 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. +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml @@ -63,7 +59,7 @@ BuildArch: noarch %description -n %{name}+unstable-devel %{_description} This package contains library source intended for building other packages which -use "the unstable" feature of the "%{crate}" crate. +use the "unstable" feature of the "%{crate}" crate. %files -n %{name}+unstable-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml diff --git a/sources b/sources index 4c787b7..ca1d5f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libm-0.2.1.crate) = a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9 +SHA512 (libm-0.2.2.crate) = 5aed180dec326ed9ee2fb90dfd94127ee5f75804f7ce7fa0ed5c7e1f0533215690553551da44c055f9ad47170ca32971467fb378f7328a3c22930832388eed75 From 8fcd4795e1e665922b806165e9903df3394f4b58 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 6 Aug 2022 18:06:01 +0200 Subject: [PATCH 4/5] Update to version 0.2.3; Fixes RHBZ#2112500 --- .gitignore | 1 + libm-fix-metadata.diff | 10 +++++----- rust-libm.spec | 31 +++++++++++++++++-------------- .rust2rpm.conf => rust2rpm.conf | 0 sources | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-) rename .rust2rpm.conf => rust2rpm.conf (100%) diff --git a/.gitignore b/.gitignore index eb7e0d0..b9909dd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /libm-0.1.4.crate /libm-0.2.1.crate /libm-0.2.2.crate +/libm-0.2.3.crate diff --git a/libm-fix-metadata.diff b/libm-fix-metadata.diff index cab7804..fdde368 100644 --- a/libm-fix-metadata.diff +++ b/libm-fix-metadata.diff @@ -1,10 +1,10 @@ ---- libm-0.2.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ libm-0.2.2/Cargo.toml 2022-02-07T22:51:18.738558+00:00 -@@ -21,6 +21,7 @@ +--- libm-0.2.3/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ libm-0.2.3/Cargo.toml 2022-08-06T16:03:48.236361+00:00 +@@ -24,6 +24,7 @@ categories = ["no-std"] license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/libm" -+exclude = ["/ci/*"] ++exclude = ["/ci/"] + [profile.release] lto = "fat" - [dev-dependencies.no-panic] diff --git a/rust-libm.spec b/rust-libm.spec index 1fa8835..81b4732 100644 --- a/rust-libm.spec +++ b/rust-libm.spec @@ -1,25 +1,25 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 22 %bcond_without check %global debug_package %{nil} %global crate libm -Name: rust-%{crate} -Version: 0.2.2 +Name: rust-libm +Version: 0.2.3 Release: %autorelease Summary: Libm in pure Rust -# 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/libm Source: %{crates_source} -# Initial patched metadata -# * Exclude ci/, https://github.com/japaric/libm/pull/148 -Patch0: libm-fix-metadata.diff +# Manually created patch for downstream crate metadata changes +# * exclude files that are only useful for upstream CI: +# https://github.com/japaric/libm/pull/148 +Patch: libm-fix-metadata.diff ExclusiveArch: %{rust_arches} -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Libm in pure Rust.} @@ -36,9 +36,12 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%license LICENSE-APACHE LICENSE-MIT -%doc CHANGELOG.md CONTRIBUTING.md README.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE-APACHE +%license %{crate_instdir}/LICENSE-MIT +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/CONTRIBUTING.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -50,7 +53,7 @@ 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 +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unstable-devel Summary: %{summary} @@ -62,7 +65,7 @@ This package contains library source intended for building other packages which use the "unstable" feature of the "%{crate}" crate. %files -n %{name}+unstable-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/.rust2rpm.conf b/rust2rpm.conf similarity index 100% rename from .rust2rpm.conf rename to rust2rpm.conf diff --git a/sources b/sources index ca1d5f9..8c52a67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libm-0.2.2.crate) = 5aed180dec326ed9ee2fb90dfd94127ee5f75804f7ce7fa0ed5c7e1f0533215690553551da44c055f9ad47170ca32971467fb378f7328a3c22930832388eed75 +SHA512 (libm-0.2.3.crate) = b436775d2749fadbdb0d506d50fdf4361b522a506c1b632c69861a7ec55a757c3a66e539db67f96d290e3d927935b5394c1afe1bbb122e381353cd714ab2f340 From 9ff59a1c6d93eea78e295e7832a2960973f88a72 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 20 Aug 2022 22:14:19 +0200 Subject: [PATCH 5/5] Update to version 0.2.5; Fixes RHBZ#2117097 --- .gitignore | 1 + libm-fix-metadata.diff | 8 ++++---- rust-libm.spec | 2 +- sources | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b9909dd..695372d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /libm-0.2.1.crate /libm-0.2.2.crate /libm-0.2.3.crate +/libm-0.2.5.crate diff --git a/libm-fix-metadata.diff b/libm-fix-metadata.diff index fdde368..abc6dd3 100644 --- a/libm-fix-metadata.diff +++ b/libm-fix-metadata.diff @@ -1,9 +1,9 @@ ---- libm-0.2.3/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ libm-0.2.3/Cargo.toml 2022-08-06T16:03:48.236361+00:00 -@@ -24,6 +24,7 @@ - categories = ["no-std"] +--- libm-0.2.5/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ libm-0.2.5/Cargo.toml 2022-08-20T20:12:55.550260+00:00 +@@ -25,6 +25,7 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/libm" + resolver = "1" +exclude = ["/ci/"] [profile.release] diff --git a/rust-libm.spec b/rust-libm.spec index 81b4732..4e66efd 100644 --- a/rust-libm.spec +++ b/rust-libm.spec @@ -5,7 +5,7 @@ %global crate libm Name: rust-libm -Version: 0.2.3 +Version: 0.2.5 Release: %autorelease Summary: Libm in pure Rust diff --git a/sources b/sources index 8c52a67..8217dd1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libm-0.2.3.crate) = b436775d2749fadbdb0d506d50fdf4361b522a506c1b632c69861a7ec55a757c3a66e539db67f96d290e3d927935b5394c1afe1bbb122e381353cd714ab2f340 +SHA512 (libm-0.2.5.crate) = 4d56501fdc86011f1b707b349c409564c85c2484b185adf9dc5d5a8a8fcca8c0e172c95ee5dbfb428b7b13d8cfb1e23c596d3ae3bfa878f2019fabd3258c7863