Fix kbd fails to build with --nocheck

This commit is contained in:
Vitezslav Crhonek 2020-09-23 08:11:51 +02:00
parent bd9efc38c3
commit 02a2eb26c9

View File

@ -5,7 +5,7 @@
Name: kbd Name: kbd
Version: 2.3.0 Version: 2.3.0
Release: 2%{?dist} Release: 3%{?dist}
Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
License: GPLv2+ License: GPLv2+
URL: http://www.kbd-project.org/ URL: http://www.kbd-project.org/
@ -179,9 +179,6 @@ fi
%ifnarch s390x %ifnarch s390x
make check make check
%endif %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 %files -f %{name}.lang
%license COPYING %license COPYING
@ -189,6 +186,9 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug/%{_libdir}/libtswrap*
%{_bindir}/* %{_bindir}/*
%{_mandir}/*/* %{_mandir}/*/*
%config(noreplace) %{_sysconfdir}/pam.d/vlock %config(noreplace) %{_sysconfdir}/pam.d/vlock
# library used only for tests
%exclude %{_libdir}/libtswrap*
%exclude %{_prefix}/lib/debug/%{_libdir}/libtswrap*
%files misc %files misc
%{kbd_datadir} %{kbd_datadir}
@ -198,6 +198,10 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug/%{_libdir}/libtswrap*
%{kbd_datadir}/keymaps/legacy %{kbd_datadir}/keymaps/legacy
%changelog %changelog
* Wed Sep 23 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-3
- Exclude test library instead of removing it to fix --nocheck builds
Resolves: #1881515
* Fri Aug 28 2020 Adam Williamson <awilliam@redhat.com> - 2.3.0-2 * Fri Aug 28 2020 Adam Williamson <awilliam@redhat.com> - 2.3.0-2
- Rebuild with grep #1872913 fix to correctly drop non-ASCII layouts - Rebuild with grep #1872913 fix to correctly drop non-ASCII layouts
Resolves: #1872922 Resolves: #1872922