From 02a2eb26c9357fb02eb951933facff4c6d5c3353 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Sep 23 2020 06:11:51 +0000 Subject: Fix kbd fails to build with --nocheck --- diff --git a/kbd.spec b/kbd.spec index bbeb1b9..7857365 100644 --- a/kbd.spec +++ b/kbd.spec @@ -5,7 +5,7 @@ Name: kbd Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) License: GPLv2+ URL: http://www.kbd-project.org/ @@ -179,9 +179,6 @@ fi %ifnarch s390x make check %endif -# remove library used only for tests -rm -f $RPM_BUILD_ROOT%{_libdir}/libtswrap* -rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug/%{_libdir}/libtswrap* %files -f %{name}.lang %license COPYING @@ -189,6 +186,9 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug/%{_libdir}/libtswrap* %{_bindir}/* %{_mandir}/*/* %config(noreplace) %{_sysconfdir}/pam.d/vlock +# library used only for tests +%exclude %{_libdir}/libtswrap* +%exclude %{_prefix}/lib/debug/%{_libdir}/libtswrap* %files misc %{kbd_datadir} @@ -198,6 +198,10 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug/%{_libdir}/libtswrap* %{kbd_datadir}/keymaps/legacy %changelog +* Wed Sep 23 2020 Vitezslav Crhonek - 2.3.0-3 +- Exclude test library instead of removing it to fix --nocheck builds + Resolves: #1881515 + * Fri Aug 28 2020 Adam Williamson - 2.3.0-2 - Rebuild with grep #1872913 fix to correctly drop non-ASCII layouts Resolves: #1872922