- Don't ship patch backup files, second attempt

kbd.spec

@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
@@ -35,9 +35,9 @@ fonts, the virtual terminals and font files.
 %patch0 -p1 -b .sparc
 %patch1 -p1
 %patch2 -p1 -b .terminal
-%patch3 -p1 -b .utf8ru
+%patch3 -p1
 %patch4 -p1 -b .man
-%patch5 -p1 -b .Meta_acute
+%patch5 -p1
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -58,11 +58,6 @@ perl -pi -e 's/LatArCyrHeb-16/latarcyrheb-sun16/' src/unicode_start
 %build
 export OLD_PO_FILE_INPUT=yes
 
-# We don't want the backups to show up on an actually installed system
-# (But we want them after an rpm -bp kbd.spec, so don't remove -b)
-find . -name "*.p[0-9]" |xargs rm -f
-rm data/keymaps/i386/qwerty/ru.map.utf8ru
-
 # We don't use % {configure} because the ./configure included here does not
 # understand most of the options.
 CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
@@ -125,6 +120,9 @@ install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \
 %config %{_sysconfdir}/pam.d/*
 
 %changelog
+* Sun Feb 20 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-5
+- Don't ship patch backup files, second attempt
+
 * Sat Feb 19 2005 Miloslav Trmac <mitr@redhat.com> - 1.12-4
 - Don't ship a patch backup file
 - Mention in setfont.8 that 512-glyph fonts reduce the number of available