Accepting request 114875 from home:rjschwei:branches:Base:System
usrMerge project - move files from toplevel to /usr OBS-URL: https://build.opensuse.org/request/show/114875 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=42
This commit is contained in:
Andreas Jaeger
Git OBS Bridge
parent
4ccdbdc4e1
commit
2361a55ef7
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 20 15:40:30 UTC 2012 - rschweikert@suse.com
|
||||
|
||||
- Place binaries into /usr tree (UsrMerge project)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 20 17:35:35 CET 2011 - sbrabec@suse.cz
|
||||
|
||||
|
||||
121
kbd.spec
121
kbd.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package kbd
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,16 +16,15 @@
|
||||
#
|
||||
|
||||
|
||||
|
||||
Name: kbd
|
||||
# git: git://git.altlinux.org/people/legion/packages/kbd.git
|
||||
Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/
|
||||
License: GPL-2.0+
|
||||
Group: System/Console
|
||||
BuildRequires: automake
|
||||
Version: 1.15.3
|
||||
Release: 0
|
||||
Summary: Keyboard and Font Utilities
|
||||
License: GPL-2.0+
|
||||
Group: System/Console
|
||||
%if 0
|
||||
Source: kbd-%{version}.tar.bz2
|
||||
%else
|
||||
@ -107,10 +106,7 @@ pushd data/keymaps/i386
|
||||
test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map
|
||||
popd
|
||||
%configure \
|
||||
--prefix=/ \
|
||||
--datadir=%{kbd} \
|
||||
--mandir=%{_mandir} \
|
||||
--bindir=/bin \
|
||||
--enable-nls \
|
||||
--localedir=/usr/share/locale \
|
||||
--enable-optional-progs
|
||||
@ -124,10 +120,7 @@ mv t.psfu $font
|
||||
make
|
||||
|
||||
%install
|
||||
mkdir -p $RPM_BUILD_ROOT/bin
|
||||
mkdir -p $RPM_BUILD_ROOT/sbin
|
||||
#mkdir -p $RPM_BUILD_ROOT/usr/bin
|
||||
#mkdir -p $RPM_BUILD_ROOT/usr/sbin
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/init.d
|
||||
DOC=${RPM_BUILD_ROOT}%{_defaultdocdir}/kbd
|
||||
KBD=%{kbd}
|
||||
@ -162,7 +155,7 @@ if ls $K/consolefonts/Agafari-* > /dev/null 2>&1; then
|
||||
exit 1
|
||||
fi
|
||||
install -m 755 %SOURCE4 $RPM_BUILD_ROOT/etc/init.d/kbd
|
||||
ln -sf ../etc/init.d/kbd $RPM_BUILD_ROOT/sbin/rckbd
|
||||
ln -s /etc/init.d/kbd $RPM_BUILD_ROOT%{_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
|
||||
@ -239,10 +232,60 @@ cat %SOURCE6 >> $FILLUP_DIR/sysconfig.keyboard
|
||||
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/getkeycodes.8*
|
||||
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/setkeycodes.8*
|
||||
%endif
|
||||
install -m 755 %_sourcedir/testutf8 $RPM_BUILD_ROOT/bin/
|
||||
install -m 755 fbtest $RPM_BUILD_ROOT/sbin/
|
||||
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/bin/guess_encoding
|
||||
install -m 755 %SOURCE13 $RPM_BUILD_ROOT/%{_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
|
||||
%ifnarch %sparc m68k
|
||||
ln -s %{_bindir}/getkeycodes $RPM_BUILD_ROOT/bin
|
||||
ln -s %{_bindir}/setkeycodes $RPM_BUILD_ROOT/bin
|
||||
%endif
|
||||
%ifarch %ix86
|
||||
ln -s %{_bindir}/resizecons $RPM_BUILD_ROOT/bin
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
ln -s %{_bindir}/resizecons $RPM_BUILD_ROOT/bin
|
||||
%endif
|
||||
#EndUsrMerge
|
||||
%find_lang %{name}
|
||||
|
||||
%post
|
||||
@ -264,6 +307,7 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding
|
||||
/var/adm/fillup-templates/sysconfig.console
|
||||
/var/adm/fillup-templates/sysconfig.keyboard
|
||||
%{kbd}
|
||||
#UsrMerge
|
||||
/sbin/rckbd
|
||||
/sbin/fbtest
|
||||
/bin/chvt
|
||||
@ -310,6 +354,53 @@ install -m 755 %SOURCE13 $RPM_BUILD_ROOT/bin/guess_encoding
|
||||
/bin/setvesablank
|
||||
/bin/spawn_console
|
||||
/bin/spawn_login
|
||||
#EndUsrMerge
|
||||
%{_sbindir}/rckbd
|
||||
%{_sbindir}/fbtest
|
||||
%{_bindir}/chvt
|
||||
%{_bindir}/openvt
|
||||
%{_bindir}/deallocvt
|
||||
%{_bindir}/dumpkeys
|
||||
%ifnarch %sparc m68k
|
||||
%{_bindir}/getkeycodes
|
||||
%{_bindir}/setkeycodes
|
||||
%endif
|
||||
%{_bindir}/fgconsole
|
||||
%{_bindir}/kbd_mode
|
||||
%{_bindir}/kbdinfo
|
||||
%{_bindir}/loadkeys
|
||||
%{_bindir}/loadunimap
|
||||
%{_bindir}/mapscrn
|
||||
%{_bindir}/psfaddtable
|
||||
%{_bindir}/psfgettable
|
||||
%{_bindir}/psfstriptable
|
||||
%{_bindir}/psfxtable
|
||||
%ifarch %ix86
|
||||
%{_bindir}/resizecons
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
%{_bindir}/resizecons
|
||||
%endif
|
||||
%{_bindir}/setfont
|
||||
%{_bindir}/setleds
|
||||
%{_bindir}/setmetamode
|
||||
%{_bindir}/setvtrgb
|
||||
%{_bindir}/showconsolefont
|
||||
%{_bindir}/showkey
|
||||
%{_bindir}/unicode_start
|
||||
%{_bindir}/unicode_stop
|
||||
%{_bindir}/kbdrate
|
||||
%{_bindir}/testutf8
|
||||
%{_bindir}/guess_encoding
|
||||
%{_bindir}/clrunimap
|
||||
%{_bindir}/getunimap
|
||||
%{_bindir}/outpsfheader
|
||||
%{_bindir}/screendump
|
||||
%{_bindir}/setlogcons
|
||||
%{_bindir}/setpalette
|
||||
%{_bindir}/setvesablank
|
||||
%{_bindir}/spawn_console
|
||||
%{_bindir}/spawn_login
|
||||
%doc %{_mandir}/man1/*
|
||||
%doc %{_mandir}/man5/keymaps.5.gz
|
||||
%ifnarch %sparc m68k
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user