Merge review

kbd.spec

@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        1.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -20,7 +20,7 @@ BuildRequires:  bison, flex, gettext
 Obsoletes:      console-tools open
 Provides:       console-tools open
 Conflicts:      util-linux < 2.11r-9
-Prereq:         initscripts >= 5.86-1
+Requires:       initscripts >= 5.86-1
 ExcludeArch:    s390 s390x
 
 %description
@@ -56,13 +56,17 @@ mv olpc/pt.map olpc/pt-olpc.map
 mv qwerty/cz.map qwerty/cz-qwerty.map
 popd
 
+# Convert to utf-8
+iconv -f iso-8859-1 -t utf-8 < "ChangeLog" > "ChangeLog_"
+mv "ChangeLog_" "ChangeLog"
+
 %build
-%configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=/usr/share/locale --enable-nls
+%configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls
 make %{?_smp_mflags} LDFLAGS="-static"
 mv src/loadkeys src/loadkeys.static
 make clean
 
-%configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=/usr/share/locale --enable-nls
+%configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls
 make %{?_smp_mflags}
 
 %install
@@ -102,13 +106,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc ChangeLog AUTHORS README 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*
 /bin/*
 %{_bindir}/*
 %{_mandir}/*/*
 /lib/kbd
 
 %changelog
+* Thu Feb  5 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15-4
+- Merge review
+  Resolves: #225958
+
 * Thu Jan 29 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15-3
 - Rename conflicting keymaps to have unique names
   Resolves: #481674