Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/kbd.git#de77dbc7a309249887deff748456f0d34e930ead
This commit is contained in:
DistroBaker 2020-10-30 02:40:47 +01:00
parent c81e99cd01
commit e3bbbe5d82

View File

@ -5,7 +5,7 @@
Name: kbd Name: kbd
Version: 2.3.0 Version: 2.3.0
Release: 3%{?dist} Release: 4%{?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/
@ -38,8 +38,6 @@ Patch7: kbd-2.0.4-covscan-fixes.patch
BuildRequires: gcc, bison, flex, gettext, pam-devel, check-devel, automake BuildRequires: gcc, bison, flex, gettext, pam-devel, check-devel, automake
BuildRequires: console-setup, xkeyboard-config BuildRequires: console-setup, xkeyboard-config
Requires: %{name}-misc = %{version}-%{release} Requires: %{name}-misc = %{version}-%{release}
# Temporarily require -legacy
Requires: %{name}-legacy = %{version}-%{release}
# Be sure that system is after UsrMove # Be sure that system is after UsrMove
Conflicts: filesystem < 3 Conflicts: filesystem < 3
Provides: vlock = %{version} Provides: vlock = %{version}
@ -198,6 +196,10 @@ make check
%{kbd_datadir}/keymaps/legacy %{kbd_datadir}/keymaps/legacy
%changelog %changelog
* Thu Oct 29 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-4
- Don't require kbd-legacy in main kbd package anymore
Resolves: #1891811
* Wed Sep 23 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-3 * Wed Sep 23 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-3
- Exclude test library instead of removing it to fix --nocheck builds - Exclude test library instead of removing it to fix --nocheck builds
Resolves: #1881515 Resolves: #1881515