From 3bc7b803886a699cbea597b0a8ac657e1de6d0ac Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 11 Nov 2020 17:07:53 +0100 Subject: [PATCH] reintroduce accidentally removed "align" feature --- libc-fix-metadata.diff | 4 ++-- rust-libc.spec | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/libc-fix-metadata.diff b/libc-fix-metadata.diff index 8a992e4..11e2fb7 100644 --- a/libc-fix-metadata.diff +++ b/libc-fix-metadata.diff @@ -1,6 +1,6 @@ --- libc-0.2.80/Cargo.toml 2020-10-25T20:52:21+00:00 +++ libc-0.2.80/Cargo.toml 2020-11-04T20:03:44.950947+00:00 -@@ -24,16 +24,12 @@ +@@ -24,16 +24,11 @@ categories = ["external-ffi-bindings", "no-std", "os"] license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/libc" @@ -9,7 +9,7 @@ -optional = true [features] --align = [] + align = [] -const-extern-fn = [] default = ["std"] extra_traits = [] diff --git a/rust-libc.spec b/rust-libc.spec index 95ee199..abd5926 100644 --- a/rust-libc.spec +++ b/rust-libc.spec @@ -6,13 +6,17 @@ Name: rust-%{crate} Version: 0.2.80 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Raw FFI bindings to platform libraries like libc # Upstream license specification: MIT OR Apache-2.0 License: MIT or ASL 2.0 URL: https://crates.io/crates/libc Source: %{crates_source} +# Initial patched metadata +# * drop dependencies on compiler internals (rustc-std-workspace-core) +# * drop nightly-only "const-extern-fn" feature +Patch0: libc-fix-metadata.diff ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -53,16 +57,16 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml -%package -n %{name}+const-extern-fn-devel +%package -n %{name}+align-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+const-extern-fn-devel %{_description} +%description -n %{name}+align-devel %{_description} This package contains library source intended for building other packages -which use "const-extern-fn" feature of "%{crate}" crate. +which use "align" feature of "%{crate}" crate. -%files -n %{name}+const-extern-fn-devel +%files -n %{name}+align-devel %ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml %package -n %{name}+extra_traits-devel @@ -121,6 +125,9 @@ echo 'glibc-devel' %endif %changelog +* Wed Nov 11 2020 Fabio Valentini - 0.2.80-2 +- Reintroduce accidentally removed "align" feature. + * Wed Nov 04 2020 Fabio Valentini - 0.2.80-1 - Update to version 0.2.80. - Remove nightly-only and compiler-internal features and dependencies