Rebuild for fixed frame pointer compiler flags in Rust RPM macros

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -6,3 +6,4 @@
 /skim-0.8.0.crate
 /skim-0.8.1.crate
 /skim-0.8.2.crate
+/skim-0.9.4.crate

changelog

@@ -0,0 +1,64 @@
+* Sat Aug 07 2021 Fabio Valentini <decathorpe@gmail.com> - 0.9.4-4
+- Rebuild with crossbeam-deque 0.8.1 / 0.7.4 for CVE-2021-32810
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 29 2021 Fabio Valentini <decathorpe@gmail.com> - 0.9.4-2
+- Work around harmless test failure on 32-bit architectures.
+
+* Mon Jun 28 2021 Fabio Valentini <decathorpe@gmail.com> - 0.9.4-1
+- Update to version 0.9.4.
+- Fixes RHBZ#1889197
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 28 13:32:45 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.8.2-5
+- Rebuild
+
+* Sun Aug 16 15:01:45 GMT 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.8.2-4
+- Rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jun 26 17:15:39 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.8.2-1
+- Update to 0.8.2
+
+* Wed Apr 08 2020 Josh Stone <jistone@redhat.com> - 0.8.1-1
+- Update to 0.8.1
+
+* Sun Feb 23 17:27:21 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 24 2020 Josh Stone <jistone@redhat.com> - 0.7.0-1
+- Update to 0.7.0
+
+* Sun Dec 15 14:29:21 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.9-2
+- Update derive_builder to 0.9
+
+* Mon Sep 23 07:58:05 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.9-1
+- Update to 0.6.9
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jun 24 21:43:07 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.8-1
+- Update to 0.6.8
+
+* Wed Jun 05 2019 Josh Stone <jistone@redhat.com> - 0.6.7-2
+- Bump nix to 0.14
+
+* Fri May 31 20:09:57 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0.6.7-1
+- Release 0.6.7
+
+* Sun Apr 14 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0.6.6-1
+- Initial package

rust-skim.spec

@@ -1,17 +1,22 @@
-# Generated by rust2rpm 15
+# Generated by rust2rpm 17
 %bcond_without check
 
 %global crate skim
 
 Name:           rust-%{crate}
-Version:        0.8.2
-Release:        1%{?dist}
+Version:        0.9.4
+Release:        %autorelease
 Summary:        Fuzzy Finder in Rust
 
 # Upstream license specification: MIT
 License:        MIT
 URL:            https://crates.io/crates/skim
 Source:         %{crates_source}
+# Initial patched metadata
+# * bump from nix 0.19 to 0.20
+# * bump from vte 0.9 to 0.10
+# * bump from shlex to 1
+Patch0:         skim-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 %if %{__cargo_skip_build}
@@ -28,18 +33,18 @@ Fuzzy Finder in rust!.}
 %if ! %{__cargo_skip_build}
 %package     -n %{crate}
 Summary:        %{summary}
-# (MIT or ASL 2.0) and BSD
+# ASL 2.0 or MIT
 # MIT
 # MIT or ASL 2.0
 # MPLv2.0
 # Unlicense or MIT
-License:        MIT and BSD and MPLv2.0
+License:        MIT and MPLv2.0
 
 %description -n %{crate} %{_description}
 
 %files       -n %{crate}
 %license LICENSE
-%doc CHANGELOG.md README.md
+%doc README.md CHANGELOG.md
 %{_bindir}/sk
 %{_bindir}/sk-tmux
 %{_mandir}/man1/sk.1*
@@ -66,7 +71,7 @@ which use "%{crate}" crate.
 
 %files          devel
 %license LICENSE
-%doc CHANGELOG.md README.md
+%doc README.md CHANGELOG.md
 %{cargo_registry}/%{crate}-%{version_no_tilde}/
 
 %package     -n %{name}+default-devel
@@ -119,42 +124,11 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/skim/shell \
 
 %if %{with check}
 %check
-%cargo_test
+# * integer overflow in test code on 32-bit architectures
+#   https://github.com/lotabout/skim/issues/415
+# * rustc crashes during doctest compilation on aarch64
+%cargo_test -- --lib -- --skip test_atoi
 %endif
 
 %changelog
-* Fri Jun 26 17:15:39 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.8.2-1
-- Update to 0.8.2
-
-* Wed Apr 08 2020 Josh Stone <jistone@redhat.com> - 0.8.1-1
-- Update to 0.8.1
-
-* Sun Feb 23 17:27:21 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.8.0-1
-- Update to 0.8.0
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 24 2020 Josh Stone <jistone@redhat.com> - 0.7.0-1
-- Update to 0.7.0
-
-* Sun Dec 15 14:29:21 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.9-2
-- Update derive_builder to 0.9
-
-* Mon Sep 23 07:58:05 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.9-1
-- Update to 0.6.9
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jun 24 21:43:07 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.8-1
-- Update to 0.6.8
-
-* Wed Jun 05 2019 Josh Stone <jistone@redhat.com> - 0.6.7-2
-- Bump nix to 0.14
-
-* Fri May 31 20:09:57 CEST 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0.6.7-1
-- Release 0.6.7
-
-* Sun Apr 14 2019 Robert-André Mauchin <zebob.m@gmail.com> - 0.6.6-1
-- Initial package
+%autochangelog

skim-fix-metadata.diff

@@ -0,0 +1,29 @@
+--- skim-0.9.4/Cargo.toml       1970-01-01T00:00:00+00:00
++++ skim-0.9.4/Cargo.toml       2021-11-11T20:42:15.020180+00:00
+@@ -70,7 +70,7 @@
+ version = "0.4.6"
+ 
+ [dependencies.nix]
+-version = "0.19.1"
++version = "0.20"
+ 
+ [dependencies.rayon]
+ version = "1.0.3"
+@@ -79,7 +79,7 @@
+ version = "1.1.5"
+ 
+ [dependencies.shlex]
+-version = "0.1.1"
++version = "1"
+ 
+ [dependencies.time]
+ version = "0.2.23"
+@@ -94,7 +94,7 @@
+ version = "0.1.4"
+ 
+ [dependencies.vte]
+-version = "0.9.0"
++version = "0.10.0"
+ 
+ [features]
+ default = []

sources

@@ -1 +1 @@
-SHA512 (skim-0.8.2.crate) = 2911687d426cd2e377623e9c94747198be4357c5a02706f424b2371f256a43380f41a34a594f36bb99100774a5d2ce19bd88ea719c762e3aff187b55aeba6f19
+SHA512 (skim-0.9.4.crate) = 05ae2030c7cd28e28111d8998d677eb6d5e6cb1d69cb385e373b477a794a608fef57eace4a60bec0460697fc2ef7a3fc41de86acf55d364434f80e1ea8466403