diff --git a/kbd-1.12-el-locale-update.diff b/kbd-1.12-el-locale-update.diff new file mode 100644 index 0000000..5262164 --- /dev/null +++ b/kbd-1.12-el-locale-update.diff @@ -0,0 +1,14 @@ +--- po/Makefile.in ++++ po/Makefile.in +@@ -34,9 +34,9 @@ + COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) + + # Enter here all .po files +-POFILES = cs.po da.po de.po es.po fr.po gr.po nl.po pl.po ro.po ru.po sv.po tr.po ++POFILES = cs.po da.po de.po el.po es.po fr.po nl.po pl.po ro.po ru.po sv.po tr.po + # the same but with .gmo +-GMOFILES = cs.gmo da.gmo de.gmo es.gmo fr.gmo gr.gmo nl.gmo pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo ++GMOFILES = $(patsubst %.po, %.gmo, $(POFILES)) + + CATALOGS = $(GMOFILES) + CATOBJEXT = .gmo diff --git a/kbd.changes b/kbd.changes index c92b5b5..0098aa4 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 21 13:44:15 CEST 2007 - dmueller@suse.de + +- update 'el' localisation + ------------------------------------------------------------------- Mon Jun 18 14:07:53 CEST 2007 - jw@suse.de diff --git a/kbd.init b/kbd.init index f15c18e..c9fe314 100644 --- a/kbd.init +++ b/kbd.init @@ -27,7 +27,8 @@ # Should-Stop: # Default-Start: 1 2 3 5 S # Default-Stop: -# Description: Keyboard settings (don't disable!) +# Short-Description: Keyboard settings +# Description: Keyboard settings (don't disable!) ### END INIT INFO . /etc/rc.status diff --git a/kbd.spec b/kbd.spec index fb83a45..293e0ba 100644 --- a/kbd.spec +++ b/kbd.spec @@ -16,7 +16,7 @@ License: GNU General Public License (GPL) Group: System/Console Autoreqprov: on Version: 1.12 -Release: 116 +Release: 117 Summary: Keyboard and Font Utilities Source: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/%{name}-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 @@ -53,10 +53,9 @@ Patch20: kbd-%{version}-strip.diff Patch21: kbd-%{version}-setfont-fpclose.diff Patch22: kbd-%{version}-showconsolefont-info.diff Patch23: kbd-%{version}-docu-X11R6-xorg.diff +Patch24: kbd-%{version}-el-locale-update.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %suse_version > 800 PreReq: %fillup_prereq %insserv_prereq -%endif BuildRequires: bison flex %description @@ -79,7 +78,6 @@ Authors: %if %{kbdrate_in_util} echo "kbdrate is in util" %endif -echo $RPM_BUILD_ROOT %setup -q -a 1 -a 2 -n kbd-%{version} %patch -p1 -E # choose-tty.diff went upstream, 27.2.2004, jw @@ -105,6 +103,7 @@ echo $RPM_BUILD_ROOT %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 %build for i in `find data/keymaps/mac -type f` ; do @@ -140,13 +139,12 @@ echo "# Now call kbd install DESTDIR=$RPM_BUILD_ROOT DATA_DIR=%{kbd} MAN_DIR=%{_ make DESTDIR=$RPM_BUILD_ROOT DATA_DIR=%{kbd} MAN_DIR=%{_mandir} install # ln -s iso01-12x22.psfu $K/consolefonts/suse12x22.psfu install -m 644 data/consolefonts/README* $DOC/fonts/ -install -m 644 data/consolefonts/ERRORS $DOC/fonts/ mkdir -p $DOC/doc/ install -m 644 doc/keysyms.h.info doc/kbd.FAQ.txt doc/kbd.FAQ*.html doc/README* doc/TODO $DOC/doc/ 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 CHANGES CREDITS README $DOC/ -install %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 ""; @@ -212,8 +210,8 @@ done ) FILLUP_DIR=$RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $FILLUP_DIR -install %SOURCE8 $FILLUP_DIR/sysconfig.console -install %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 %else @@ -317,6 +315,8 @@ rm -rf $RPM_BUILD_ROOT #rm -rf $RPM_BUILD_DIR/kbd-%{version} %changelog +* Thu Jun 21 2007 - dmueller@suse.de +- update 'el' localisation * Mon Jun 18 2007 - jw@suse.de - sleep 3 removed. bugzilla #284348 * Sat Jun 16 2007 - coolo@suse.de