commit c9f10430c79036f4513e3aeb5c3d8e19beabdf5a38e5161866370c2b8cde4d3d Author: Andreas Jaeger Date: Thu Aug 13 14:36:46 2015 +0000 Accepting request 321791 from home:sndirsch:fate318355 package created; it's required by kbd in order to convert xkb layouts from xkeyboard-config to console keymaps (FATE#318426) OBS-URL: https://build.opensuse.org/request/show/321791 OBS-URL: https://build.opensuse.org/package/show/Base:System/console-setup?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/console-setup-1.76-fsf-address.patch b/console-setup-1.76-fsf-address.patch new file mode 100644 index 0000000..d05c626 --- /dev/null +++ b/console-setup-1.76-fsf-address.patch @@ -0,0 +1,11 @@ +--- console-setup/Keyboard/ckbcomp.orig 2012-06-26 12:04:16.612309745 +0200 ++++ console-setup/Keyboard/ckbcomp 2012-06-26 12:21:06.448385970 +0200 +@@ -15,7 +15,7 @@ + + # If you have not received a copy of the GNU General Public License + # along with this program, write to the Free Software Foundation, Inc., +-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + use warnings 'all'; + use strict; diff --git a/console-setup-1.76-paths.patch b/console-setup-1.76-paths.patch new file mode 100644 index 0000000..8165aca --- /dev/null +++ b/console-setup-1.76-paths.patch @@ -0,0 +1,168 @@ +Index: console-setup-1.130/Makefile +=================================================================== +--- console-setup-1.130.orig/Makefile ++++ console-setup-1.130/Makefile +@@ -2,7 +2,7 @@ prefix = /usr/local + # etcdir must be either /etc or + etcdir = $(prefix)/etc + bootprefix = $(patsubst %/usr,%/,$(prefix:%/=%)) +-mandir = $(prefix)/share/man ++mandir = $(prefix)/usr/share/man + + SHELL = /bin/sh + +@@ -36,8 +36,8 @@ build-all: build-linux build-freebsd bui + + .PHONY: install-common + install-common: build-common +- install -d $(bootprefix)/bin/ +- install setupcon $(bootprefix)/bin/ ++ install -d $(bootprefix)/usr/bin/ ++ install setupcon $(bootprefix)/usr/bin/ + install -d $(etcdir)/default + install -m 644 config/keyboard $(etcdir)/default/ + install -m 644 config/console-setup $(etcdir)/default/ +@@ -49,10 +49,10 @@ install-common: build-common + + .PHONY: install-common-linux + install-common-linux: build-linux +- install -d $(prefix)/share/consolefonts/ +- install -m 644 Fonts/*.psf.gz $(prefix)/share/consolefonts/ +- install -d $(prefix)/share/consoletrans +- install -m 644 acm/*.acm.gz $(prefix)/share/consoletrans/ ++ install -d $(prefix)/usr/share/consolefonts/ ++ install -m 644 Fonts/*.psf.gz $(prefix)/usr/share/consolefonts/ ++ install -d $(prefix)/usr/share/consoletrans ++ install -m 644 acm/*.acm.gz $(prefix)/usr/share/consoletrans/ + install -d $(etcdir)/console-setup + install -m 644 Keyboard/compose.*.inc $(etcdir)/console-setup/ + install -m 644 Keyboard/remap.inc $(etcdir)/console-setup/ +@@ -77,8 +77,8 @@ install-ckbcomp: + mkdir -p $(etcdir)/console-setup \ + && cp -r Keyboard/ckb/ $(etcdir)/console-setup/ckb; \ + fi +- install -d $(prefix)/bin/ +- install -m 755 Keyboard/ckbcomp $(prefix)/bin/ ++ install -d $(prefix)/usr/bin/ ++ install -m 755 Keyboard/ckbcomp $(prefix)/usr/bin/ + install -d $(mandir)/man1/ + install -m 644 man/ckbcomp.1 $(mandir)/man1/ + +Index: console-setup-1.130/man/ckbcomp.1 +=================================================================== +--- console-setup-1.130.orig/man/ckbcomp.1 ++++ console-setup-1.130/man/ckbcomp.1 +@@ -46,7 +46,7 @@ Print a usage message and exit. + .BI -charmap\ charmap + The encoding to use for the output keymap. There should be an + character mapping table defining this encoding in +-.IR /usr/local/share/consoletrans . ++.IR /usr/share/consoletrans . + Definitions of the following charmaps are provided: + .nh + .BR ARMSCII-8 , +@@ -86,8 +86,9 @@ for files included by the keymap descrip + multiple times. If a file can not be found in any of the specified + directories, it will be searched also in some other standard + locations, such as +-.IR /usr/local/etc/console-setup/ckb , +-.IR /usr/local/share/X11/xkb ++.IR /etc/console-setup/ckb , ++.IR /usr/local/share/X11/xkb , ++.IR /usr/share/X11/xkb + and + .IR /etc/X11/xkb + +@@ -167,9 +168,9 @@ Specifies the layout variant used to cho + Adds an option used to choose component names. + + .SH FILES +-.I /usr/local/share/consoletrans ++.I /usr/share/consoletrans + .br +-.I /usr/local/etc/console-setup/ckb ++.I /etc/console-setup/ckb + .br + .I /usr/share/X11/xkb + .br +Index: console-setup-1.130/man/console-setup.5 +=================================================================== +--- console-setup-1.130.orig/man/console-setup.5 ++++ console-setup-1.130/man/console-setup.5 +@@ -378,16 +378,16 @@ Completely covered by the following font + The standard location of the + .B console-setup + configuration file is +-.IR /usr/local/etc/default/console-setup . ++.IR /etc/default/console-setup . + The keyboard configuration is in +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + Fonts that can be used with the variable + .B FONT + are usually installed in +-.IR /usr/share/consolefonts/ " or " /usr/share/syscons/fonts/ . ++.IR /usr/share/consolefonts/ " or " /lib/kbd/consolefonts/ . + Translation maps that can be used with the variable CONSOLE_MAP are + usually installed in +-.IR /usr/share/consoletrans/ " or " /usr/share/syscons/scrnmaps/ . ++.IR /usr/share/consoletrans/ " or " /lib/kbd/consoletrans/ . + + .SH NOTES + The aim of the Terminus font is to reduce the eyes-fatigue when one +Index: console-setup-1.130/man/keyboard.5 +=================================================================== +--- console-setup-1.130.orig/man/keyboard.5 ++++ console-setup-1.130/man/keyboard.5 +@@ -154,12 +154,12 @@ on FreeBSD. + The standard location of the + .B keyboard + file is +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + Description of all available keyboard models, layouts, variants and + options is available in +-.IR /usr/local/share/X11/xkb/rules/xorg.lst . ++.IR /usr/share/X11/xkb/rules/xorg.lst . + In most cases, in +-.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/ ++.IR /lib/kbd/keymaps/ + you will find several keymaps that can be used with the variable + .BR KMAP . + +Index: console-setup-1.130/man/setupcon.1 +=================================================================== +--- console-setup-1.130.orig/man/setupcon.1 ++++ console-setup-1.130/man/setupcon.1 +@@ -22,11 +22,11 @@ the console. Most of the time you invok + without arguments. The keyboard configuration is specified in + .I ~/.keyboard + or +-.IR /usr/local/etc/default/keyboard . ++.IR /etc/default/keyboard . + The font configuration is specified in + .I ~/.console-setup + or +-.IR /usr/local/etc/default/console-setup . ++.IR /etc/default/console-setup . + Consult + .BR keyboard (5) + and +@@ -151,13 +151,13 @@ Display usage information. + .br + .I ~/.keyboard + .br +-.I /usr/local/etc/default/console-setup ++.I /etc/default/console-setup + .br +-.I /usr/local/etc/default/keyboard ++.I /etc/default/keyboard + .br +-.I /usr/local/etc/default/console-setup.VARIANT ++.I /etc/default/console-setup.VARIANT + .br +-.I /usr/local/etc/default/keyboard.VARIANT ++.I /etc/default/keyboard.VARIANT + .br + .I /etc/console-setup/ + diff --git a/console-setup.changes b/console-setup.changes new file mode 100644 index 0000000..80fd6df --- /dev/null +++ b/console-setup.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri Jul 17 10:49:37 UTC 2015 - sndirsch@suse.com + +- package created; it's required by kbd in order to convert xkb + layouts from xkeyboard-config to console keymaps (FATE#318426) diff --git a/console-setup.spec b/console-setup.spec new file mode 100644 index 0000000..ef34b4f --- /dev/null +++ b/console-setup.spec @@ -0,0 +1,72 @@ +# +# spec file for package +# +# Copyright (c) 2015 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +Name: console-setup +Version: 1.130 +Release: 0 +License: GPL-2.0+ and MIT and SUSE-Public-Domain +Summary: Tools for configuring the console using X Window System key maps +Url: http://packages.debian.org/cs/sid/console-setup +Group: Applications/System +Source: http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.xz +# Fixes installing paths to Fedora style +Patch0: console-setup-1.76-paths.patch +# Fixes FSF address, sent to upstream +Patch1: console-setup-1.76-fsf-address.patch + +BuildRequires: perl +BuildRequires: perl(encoding) +Requires: kbd +# require 'xkeyboard-config' to have X Window keyboard descriptions? +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +This package provides the console with the same keyboard configuration +scheme that X Window System has. Besides the keyboard, the package configures +also the font on the console. It includes a rich collection of fonts and +supports several languages that would be otherwise unsupported on the console +(such as Armenian, Georgian, Lao and Thai). + +%prep +%setup -q +%patch0 -p1 -b .paths +%patch1 -p1 -b .fsf-address + +%build +make build-linux + +%install +make prefix=$RPM_BUILD_ROOT install-linux +# we don't want another set of keyboard descriptions, we want to use descriptions from +# xkeyboard-config (require it?), so removing it +# or maybe have these from tarball it in optional subpackage? +rm -rf $RPM_BUILD_ROOT/etc/console-setup + +%files +%defattr(-,root,root) +%doc README COPYRIGHT CHANGES copyright.fonts copyright.xkb Fonts/copyright +%{_bindir}/ckbcomp +%{_bindir}/setupcon +%config(noreplace) %{_sysconfdir}/default/console-setup +%config(noreplace) %{_sysconfdir}/default/keyboard +%{_datadir}/consolefonts +%{_datadir}/consoletrans +%{_mandir}/*/* + +%changelog + diff --git a/console-setup_1.130.tar.xz b/console-setup_1.130.tar.xz new file mode 100644 index 0000000..89823ad --- /dev/null +++ b/console-setup_1.130.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a69eba80bdaa7459bd12d5e9a29adad28a50bf8935e0bc99962cd4ae7f554a50 +size 1808228