merge review

This commit is contained in:
vcrhonek 2009-02-06 10:41:29 +00:00
parent f58621eebd
commit ef00d626f3

View File

@ -5,6 +5,7 @@ Summary: Tools for configuring the console (keyboard, virtual terminals,
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://ftp.altlinux.org/pub/people/legion/kbd
Source0: http://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.gz Source0: http://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.gz
Source1: kbd-latsun-fonts.tar.bz2 Source1: kbd-latsun-fonts.tar.bz2
Source2: ro_maps.tar.bz2 Source2: ro_maps.tar.bz2
@ -17,8 +18,6 @@ Patch3: kbd-1.15-unicode_start.patch
Patch4: kbd-1.15-resizecon-x86_64.patch Patch4: kbd-1.15-resizecon-x86_64.patch
BuildRequires: bison, flex, gettext BuildRequires: bison, flex, gettext
Obsoletes: console-tools open
Provides: console-tools open
Conflicts: util-linux < 2.11r-9 Conflicts: util-linux < 2.11r-9
Requires: initscripts >= 5.86-1 Requires: initscripts >= 5.86-1
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
@ -106,15 +105,17 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ChangeLog AUTHORS README COPYING doc/kbd.FAQ*.html doc/font-formats/*.html doc/utf/utf* %doc ChangeLog AUTHORS README COPYING doc/kbd.FAQ*.html doc/font-formats/*.html doc/utf/utf* doc/dvorak/*
/bin/* /bin/*
%{_bindir}/* %{_bindir}/*
%{_mandir}/*/* %{_mandir}/*/*
/lib/kbd /lib/kbd
%changelog %changelog
* Thu Feb 5 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15-4 * Fri Feb 6 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15-4
- Merge review - Merge review (drop Provides/Obsoletes, change Prereq to Requires,
add URL, convert ChangeLog to utf-8, replace locale destination
with macro, add COPYING and add dvorak documentation)
Resolves: #225958 Resolves: #225958
* Thu Jan 29 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15-3 * Thu Jan 29 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15-3