Accepting request 144353 from home:DarkSS

Update to upstream version 0.15.5.

OBS-URL: https://build.opensuse.org/request/show/144353
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=44

kbd-1.15.2-defkeymap.patch

@@ -1,22 +0,0 @@
-Revert commit 743cbc3ca11301598ad7da503b2238041082bb75
----
- src/paths.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: kbd-1.15.2/src/paths.h
-===================================================================
---- kbd-1.15.2.orig/src/paths.h
-+++ kbd-1.15.2/src/paths.h
-@@ -18,10 +18,10 @@
-  * Default keymap, and where the kernel copy of it lives.
-  */
- #ifdef __sparc__
--# define DEFMAP "sunkeymap.kmap"
-+# define DEFMAP "sunkeymap.map"
- # define KERNDIR "/usr/src/linux/drivers/sbus/char"
- #else
--# define DEFMAP "defkeymap.kmap"
-+# define DEFMAP "defkeymap.map"
- # define KERNDIR "/usr/src/linux/drivers/char"
- #endif
- 

kbd-1.15.3-loadkeys.diff

@@ -1,22 +0,0 @@
-Index: kbd-1.15.3/src/loadkeys.y
-===================================================================
---- kbd-1.15.3.orig/src/loadkeys.y
-+++ kbd-1.15.3/src/loadkeys.y
-@@ -352,8 +352,6 @@ static int defkeys(int fd, int kbd_mode)
- 							j, (key_map[i])[j]);
- 				}
- 			}
--			xfree(key_map[i]);
--			xfree(keymap_was_set[i]);
- 
- 		} else if (keymaps_line_seen && !defining[i]) {
- 			/* deallocate keymap */
-@@ -1116,7 +1114,7 @@ int main(int argc, char *argv[])
- 
- 	if (!optm && !optb) {
- 		/* check whether the keyboard is in Unicode mode */
--		fd = getfd(console);
-+		fd = getfd(NULL);
- 
- 		if (ioctl(fd, KDGKBMODE, &kbd_mode)) {
- 			perror("KDGKBMODE");

kbd-1.15.3-po-es.patch

@@ -1,12 +0,0 @@
-Index: kbd-1.15.3/po/es.po
-===================================================================
---- kbd-1.15.3.orig/po/es.po
-+++ kbd-1.15.3/po/es.po
-@@ -1361,7 +1361,6 @@ msgid "Found nothing to save\n"
- msgstr "No se encontró nada que guardar\n"
- 
- #: src/setfont.c:682
--#, c-format
- msgid "Saved %d-char %dx%d font file on %s\n"
- msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
- 

kbd-1.15.3-repack.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3978357061ee63f1b9d2744d2468a0f71b19e221ac30da64a6f4f6423e3a111
-size 1060502

kbd-1.15.3-resizecons-enable-x86_64.patch

@@ -1,13 +0,0 @@
-Index: kbd-1.15.3/configure.ac
-===================================================================
---- kbd-1.15.3.orig/configure.ac
-+++ kbd-1.15.3/configure.ac
-@@ -59,7 +59,7 @@ esac
- AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" = "yes")
- 
- case $host_cpu in
--	i?86*) RESIZECONS_PROGS=yes ;;
-+	i?86*|x86_64) RESIZECONS_PROGS=yes ;;
- 	*)     RESIZECONS_PROGS=no ;;
- esac
- AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes")

kbd-1.15.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f813be5992432ea9cab0fbff032fe0ec0aae7cbb4357af9fae85b59417e797f1
-size 1053049

kbd-1.15.5-repack.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5845caadfc9322a6574381c2909b38981d1f885f1122ef4f0b0f4a3dca0526b7
+size 1128691

kbd-1.15.5.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62
+size 1730719

kbd.changes

@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Wed Dec  5 20:45:40 UTC 2012 - dap.darkness@gmail.com
+
+- Update to version 1.15.5:
+  * Fix msgstr in es.po and update translations.
+  * Update changelog and increase version (1.15.5wip).
+  * po: Update vi.po from translationproject.org.
+  * Fix various vlock build errors.
+  * Fix loadkeys.analyze lex handling.
+  * Ignore config.cache files.
+- Applied into upstream kbd-1.15.3-po-es.patch was deleted.
+
+-------------------------------------------------------------------
+Mon Dec  3 18:58:13 UTC 2012 - dap.darkness@gmail.com
+
+- Update to version 1.15.4:
+  * vlock: New utility which locks one or more virtual consoles.
+  * loadkeys: Change the handling of -C option.
+  * loadkeys: Fix -d option.
+  * Add dvorak-es keymap.
+  * Add dvorak-uk keymap (Joe MacMahon).
+  * Add dvorak-sv-a1 and dvorak-sv-a5 keymaps.
+  * Add ruwin_alt_sh-UTF-8 keymap (Dmitriy Perlow).
+- kbd-1.15.3-po-es.patch was fixed.
+- Applied into upstream patches were deleted.
+- Fixed up via spec-cleaner.
+- Clean-section was removed.
+- Macro warnings were fixed via '%' deleting.
+
 -------------------------------------------------------------------
 Fri Apr 20 15:40:30 UTC 2012 - rschweikert@suse.com
 

kbd.spec

@@ -17,18 +17,17 @@
 
 
 Name:           kbd
-# git: git://git.altlinux.org/people/legion/packages/kbd.git
-Url:            ftp://ftp.altlinux.org/pub/people/legion/kbd/
-BuildRequires:  automake
-Version:        1.15.3
+Version:        1.15.5
 Release:        0
 Summary:        Keyboard and Font Utilities
 License:        GPL-2.0+
 Group:          System/Console
+# git: git://git.altlinux.org/people/legion/packages/kbd.git
+Url:            ftp://ftp.altlinux.org/pub/people/legion/kbd/
 %if 0
-Source:         kbd-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.gz
 %else
-Source:         kbd-%{version}-repack.tar.bz2
+Source:         %{name}-%{version}-repack.tar.bz2
 %endif
 Source1:        kbd_fonts.tar.bz2
 Source2:        suse-add.tar.bz2
@@ -51,17 +50,20 @@ Patch3:         kbd-1.15.2-docu-X11R6-xorg.patch
 Patch4:         kbd-1.15.2-sv-latin1-keycode10.patch
 Patch5:         kbd-1.15.2-setfont-no-cruft.patch
 Patch6:         kbd-1.15.2-dumpkeys-C-opt.patch
-Patch7:         kbd-1.15.2-defkeymap.patch
 Patch8:         kbd-1.15.2-chvt-userwait.patch
-Patch9:         kbd-%{version}-po-es.patch
-Patch10:        kbd-1.15.3-loadkeys.diff
-Patch11:        kbd-1.15.3-resizecons-enable-x86_64.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-PreReq:         %fillup_prereq %insserv_prereq
+
+BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  flex
+BuildRequires:  pam-devel
+
+Requires(pre):  %fillup_prereq
+Requires(pre):  %insserv_prereq
+
 Recommends:     fbset
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
 %description
 Load and save keyboard mappings. This is needed if you are not using
 the US keyboard map. This package also contains utilities for changing
@@ -88,15 +90,11 @@ Authors:
 %patch4 -p1
 %patch5 -p1
 %patch6
-%patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 for i in `find data/keymaps/mac -type f` ; do
-sed -i -f %{S:42} $i
+sed -i -f %{SOURCE42} $i
 done
 # workaround ambiguous keymap names
 pushd data/keymaps/i386
@@ -110,8 +108,8 @@ popd
 	--enable-nls \
 	--localedir=/usr/share/locale \
 	--enable-optional-progs
-make CFLAGS="$RPM_OPT_FLAGS -Os"
-%{__cc} $RPM_OPT_FLAGS -o fbtest   $RPM_SOURCE_DIR/fbtest.c
+make CFLAGS="%{optflags} -Os"
+gcc %{optflags} -o fbtest   $RPM_SOURCE_DIR/fbtest.c
 # fix lat2-16.psfu (bnc#340579)
 font=data/consolefonts/lat2a-16.psfu
 ./src/psfxtable -i $font -it  data/unimaps/lat2u.uni \
@@ -120,11 +118,11 @@ mv t.psfu $font
 make
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-DOC=${RPM_BUILD_ROOT}%{_defaultdocdir}/kbd
+mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+DOC=%{buildroot}%{_defaultdocdir}/kbd
 KBD=%{kbd}
-K=$RPM_BUILD_ROOT$KBD
+K=%{buildroot}$KBD
 mkdir -p $K/consolefonts
 # First install the fonts from the vfont package 
 # (allowing kbd to overwrite some of them)
@@ -136,8 +134,8 @@ install -m 644 fonts/vfont-5.10/SCRIPT $DOC/fonts/SCRIPT.vfont-5.10
 rm -f fonts/vfont-5.10/SCRIPT fonts/*/README
 install -m 644 fonts/*/* $K/consolefonts/
 # Now call kbd install
-echo "# Now call kbd install DESTDIR=$RPM_BUILD_ROOT DATA_DIR=%{kbd} MAN_DIR=%{_mandir}"
-make DESTDIR=$RPM_BUILD_ROOT DATA_DIR=%{kbd} MAN_DIR=%{_mandir} install
+echo "# Now call kbd install DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir}"
+make DESTDIR=%{buildroot} DATA_DIR=%{kbd} MAN_DIR=%{_mandir} install
 # ln -s iso01-12x22.psfu $K/consolefonts/suse12x22.psfu
 install -m 644 data/consolefonts/README* $DOC/fonts/
 mkdir -p $DOC/doc/
@@ -145,7 +143,7 @@ install -m 644 doc/keysyms.h.info doc/kbd.FAQ.txt doc/kbd.FAQ*.html doc/README*
 install -m 644 doc/as400.kbd doc/console.docs doc/repeat/set_kbd_repeat-2 $DOC/doc/
 echo "See /usr/share/i18/charmaps for a description of char maps" >$DOC/doc/README.charmaps
 install -m 644 COPYING ChangeLog CREDITS README $DOC/
-install -m 644 %SOURCE3 $DOC/
+install -m 644 %{SOURCE3} $DOC/
 rm -f $K/consolefonts/README* $K/consolefonts/ERRORS.gz
 if ls $K/consolefonts/Agafari-* > /dev/null 2>&1; then
   echo "";
@@ -154,8 +152,8 @@ if ls $K/consolefonts/Agafari-* > /dev/null 2>&1; then
   echo "";
   exit 1
 fi
-install -m 755 %SOURCE4 $RPM_BUILD_ROOT/etc/init.d/kbd
-ln -s /etc/init.d/kbd $RPM_BUILD_ROOT%{_sbindir}/rckbd
+install -m 755 %{SOURCE4} %{buildroot}%{_initddir}/kbd
+ln -s /etc/init.d/kbd %{buildroot}%{_sbindir}/rckbd
 ln -sf us.map.gz $K/keymaps/i386/qwerty/khmer.map.gz
 ln -sf us.map.gz $K/keymaps/i386/qwerty/korean.map.gz
 ln -sf us.map.gz $K/keymaps/i386/qwerty/arabic.map.gz
@@ -212,78 +210,78 @@ for i in \
 do test -f $i || ln -sv mac-us.map.gz $i
 done
 )
-FILLUP_DIR=$RPM_BUILD_ROOT/var/adm/fillup-templates
+FILLUP_DIR=%{buildroot}%{_localstatedir}/adm/fillup-templates
 mkdir -p $FILLUP_DIR
-install -m 644 %SOURCE8 $FILLUP_DIR/sysconfig.console
-install -m 644 %SOURCE9 $FILLUP_DIR/sysconfig.keyboard
+install -m 644 %{SOURCE8} $FILLUP_DIR/sysconfig.console
+install -m 644 %{SOURCE9} $FILLUP_DIR/sysconfig.keyboard
 %ifarch %ix86 alpha ia64 x86_64
-cat %SOURCE5 >> $FILLUP_DIR/sysconfig.keyboard
+cat %{SOURCE5} >> $FILLUP_DIR/sysconfig.keyboard
 %else
-cat %SOURCE6 >> $FILLUP_DIR/sysconfig.keyboard
+cat %{SOURCE6} >> $FILLUP_DIR/sysconfig.keyboard
 %endif
 #mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 #touch $RPM_BUILD_ROOT/etc/sysconfig/console
 %ifnarch %ix86
 %ifnarch x86_64
-   rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/resizecons.8*
+   rm -f %{buildroot}/%{_mandir}/man8/resizecons.8*
 %endif
 %endif
 %ifarch %sparc m68k
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/getkeycodes.8*
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/setkeycodes.8*
+rm -f %{buildroot}/%{_mandir}/man8/getkeycodes.8*
+rm -f %{buildroot}/%{_mandir}/man8/setkeycodes.8*
 %endif
-install -m 755 %_sourcedir/testutf8  $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 fbtest    $RPM_BUILD_ROOT/%{_sbindir}
-install -m 644 %SOURCE12 $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -m 755 %SOURCE13 $RPM_BUILD_ROOT/%{_bindir}/guess_encoding
+install -m 755 %_sourcedir/testutf8  %{buildroot}/%{_bindir}
+install -m 755 fbtest    %{buildroot}/%{_sbindir}
+install -m 644 %{SOURCE12} %{buildroot}/%{_mandir}/man8/
+install -m 755 %{SOURCE13} %{buildroot}/%{_bindir}/guess_encoding
 #UsrMerge
-mkdir -p $RPM_BUILD_ROOT/bin
-mkdir -p $RPM_BUILD_ROOT/sbin
-ln -s %{_bindir}/chvt $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/clrunimap $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/deallocvt $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/dumpkeys $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/fgconsole $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/getunimap $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/guess_encoding $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/kbd_mode $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/kbdinfo $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/kbdrate $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/loadkeys $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/loadunimap $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/mapscrn $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/openvt $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/outpsfheader $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/psfaddtable $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/psfgettable $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/psfstriptable $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/psfxtable $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/screendump $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/setfont $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/setleds $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/setlogcons $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/setmetamode $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/setpalette $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/setvesablank $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/setvtrgb $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/showconsolefont $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/showkey $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/spawn_console $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/spawn_login $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/testutf8 $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/unicode_start $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/unicode_stop $RPM_BUILD_ROOT/bin
-ln -s %{_sbindir}/fbtest $RPM_BUILD_ROOT/sbin
-ln -s %{_sbindir}/rckbd $RPM_BUILD_ROOT/sbin
+mkdir -p %{buildroot}/bin
+mkdir -p %{buildroot}/sbin
+ln -s %{_bindir}/chvt %{buildroot}/bin
+ln -s %{_bindir}/clrunimap %{buildroot}/bin
+ln -s %{_bindir}/deallocvt %{buildroot}/bin
+ln -s %{_bindir}/dumpkeys %{buildroot}/bin
+ln -s %{_bindir}/fgconsole %{buildroot}/bin
+ln -s %{_bindir}/getunimap %{buildroot}/bin
+ln -s %{_bindir}/guess_encoding %{buildroot}/bin
+ln -s %{_bindir}/kbd_mode %{buildroot}/bin
+ln -s %{_bindir}/kbdinfo %{buildroot}/bin
+ln -s %{_bindir}/kbdrate %{buildroot}/bin
+ln -s %{_bindir}/loadkeys %{buildroot}/bin
+ln -s %{_bindir}/loadunimap %{buildroot}/bin
+ln -s %{_bindir}/mapscrn %{buildroot}/bin
+ln -s %{_bindir}/openvt %{buildroot}/bin
+ln -s %{_bindir}/outpsfheader %{buildroot}/bin
+ln -s %{_bindir}/psfaddtable %{buildroot}/bin
+ln -s %{_bindir}/psfgettable %{buildroot}/bin
+ln -s %{_bindir}/psfstriptable %{buildroot}/bin
+ln -s %{_bindir}/psfxtable %{buildroot}/bin
+ln -s %{_bindir}/screendump %{buildroot}/bin
+ln -s %{_bindir}/setfont %{buildroot}/bin
+ln -s %{_bindir}/setleds %{buildroot}/bin
+ln -s %{_bindir}/setlogcons %{buildroot}/bin
+ln -s %{_bindir}/setmetamode %{buildroot}/bin
+ln -s %{_bindir}/setpalette %{buildroot}/bin
+ln -s %{_bindir}/setvesablank %{buildroot}/bin
+ln -s %{_bindir}/setvtrgb %{buildroot}/bin
+ln -s %{_bindir}/showconsolefont %{buildroot}/bin
+ln -s %{_bindir}/showkey %{buildroot}/bin
+ln -s %{_bindir}/spawn_console %{buildroot}/bin
+ln -s %{_bindir}/spawn_login %{buildroot}/bin
+ln -s %{_bindir}/testutf8 %{buildroot}/bin
+ln -s %{_bindir}/unicode_start %{buildroot}/bin
+ln -s %{_bindir}/unicode_stop %{buildroot}/bin
+ln -s %{_sbindir}/fbtest %{buildroot}/sbin
+ln -s %{_sbindir}/rckbd %{buildroot}/sbin
 %ifnarch %sparc m68k
-ln -s %{_bindir}/getkeycodes $RPM_BUILD_ROOT/bin
-ln -s %{_bindir}/setkeycodes $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/getkeycodes %{buildroot}/bin
+ln -s %{_bindir}/setkeycodes %{buildroot}/bin
 %endif
 %ifarch %ix86
-ln -s %{_bindir}/resizecons $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/resizecons %{buildroot}/bin
 %endif
 %ifarch x86_64
-ln -s %{_bindir}/resizecons $RPM_BUILD_ROOT/bin
+ln -s %{_bindir}/resizecons %{buildroot}/bin
 %endif
 #EndUsrMerge
 %find_lang %{name}
@@ -293,19 +291,19 @@ ln -s %{_bindir}/resizecons $RPM_BUILD_ROOT/bin
 %{fillup_only -n keyboard}
 #echo "Please read the docu about the new COMPOSETABLE rc.config variable."
 #echo "See /etc/sysconfig/console, /etc/sysconfig/keyboard"
-#echo "and %{_docdir}/kbd/README.SuSE."
+#echo "and {_docdir}/kbd/README.SuSE."
 
 %postun
 %{insserv_cleanup}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-#%config(noreplace) /etc/sysconfig/console
+#config(noreplace) /etc/sysconfig/console
 %doc %{_defaultdocdir}/kbd
-#%doc COPYING CHANGES README CREDITS
-%config /etc/init.d/kbd
-/var/adm/fillup-templates/sysconfig.console
-/var/adm/fillup-templates/sysconfig.keyboard
+#doc COPYING CHANGES README CREDITS
+%config %{_sysconfdir}/init.d/kbd
+%{_localstatedir}/adm/fillup-templates/sysconfig.console
+%{_localstatedir}/adm/fillup-templates/sysconfig.keyboard
 %{kbd}
 #UsrMerge
 /sbin/rckbd
@@ -401,6 +399,7 @@ ln -s %{_bindir}/resizecons $RPM_BUILD_ROOT/bin
 %{_bindir}/setvesablank
 %{_bindir}/spawn_console
 %{_bindir}/spawn_login
+%{_bindir}/vlock
 %doc %{_mandir}/man1/*
 %doc %{_mandir}/man5/keymaps.5.gz
 %ifnarch %sparc m68k
@@ -427,7 +426,4 @@ ln -s %{_bindir}/resizecons $RPM_BUILD_ROOT/bin
 %doc %{_mandir}/man8/setvtrgb.8.gz
 %doc %{_mandir}/man8/vcstime.8.gz
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %changelog