diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 76bb51f..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# console-setup - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 1abf1b6..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# console-setup - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/console-setup-1.76-fsf-address.patch b/console-setup-1.76-fsf-address.patch new file mode 100644 index 0000000..2950c28 --- /dev/null +++ b/console-setup-1.76-fsf-address.patch @@ -0,0 +1,12 @@ +diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp +--- 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..d437638 --- /dev/null +++ b/console-setup-1.76-paths.patch @@ -0,0 +1,163 @@ +diff -up console-setup-1.143/Makefile.orig console-setup-1.143/Makefile +--- console-setup-1.143/Makefile.orig 2016-05-24 09:43:13.424382839 +0200 ++++ console-setup-1.143/Makefile 2016-05-24 09:45:10.350994606 +0200 +@@ -14,7 +14,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 + + acmfiles := $(wildcard $./acm/*.acm) + +@@ -26,8 +26,8 @@ build-common: gzipped-acmfiles + + .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/ +@@ -39,10 +39,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/ +@@ -67,8 +67,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/ + +diff -up console-setup-1.143/man/ckbcomp.1.orig console-setup-1.143/man/ckbcomp.1 +--- console-setup-1.143/man/ckbcomp.1.orig 2011-04-06 03:01:33.000000000 +0200 ++++ console-setup-1.143/man/ckbcomp.1 2016-05-24 09:47:15.360674275 +0200 +@@ -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 +diff -up console-setup-1.143/man/console-setup.5.orig console-setup-1.143/man/console-setup.5 +--- console-setup-1.143/man/console-setup.5.orig 2016-05-19 05:01:09.000000000 +0200 ++++ console-setup-1.143/man/console-setup.5 2016-05-24 09:47:15.361674281 +0200 +@@ -403,16 +403,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 +diff -up console-setup-1.143/man/keyboard.5.orig console-setup-1.143/man/keyboard.5 +--- console-setup-1.143/man/keyboard.5.orig 2016-03-03 05:01:16.000000000 +0100 ++++ console-setup-1.143/man/keyboard.5 2016-05-24 09:47:15.361674281 +0200 +@@ -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 . + +diff -up console-setup-1.143/man/setupcon.1.orig console-setup-1.143/man/setupcon.1 +--- console-setup-1.143/man/setupcon.1.orig 2016-03-03 05:01:16.000000000 +0100 ++++ console-setup-1.143/man/setupcon.1 2016-05-24 09:47:15.361674281 +0200 +@@ -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 +@@ -162,13 +162,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-1.84-ctrll-lock.patch b/console-setup-1.84-ctrll-lock.patch new file mode 100644 index 0000000..147e2a5 --- /dev/null +++ b/console-setup-1.84-ctrll-lock.patch @@ -0,0 +1,35 @@ +diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp +--- console-setup/Keyboard/ckbcomp.orig 2018-06-21 10:58:36.262160943 +0200 ++++ console-setup/Keyboard/ckbcomp 2018-06-27 13:04:01.843639711 +0200 +@@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code ( + + my $KEYMAP = ''; # This variable contains the generated keymap + +-my $broken_caps = 0; # In unicode mode Caps_Lock doesn't work for non-ASCII +- # letters. 1 = the keymap contains non-ascii letters. +- # See http://bugzilla.kernel.org/show_bug.cgi?id=7746#c21 +- + my %keycodes_table; # x keysym -> x key code + my %aliases; # x keysym -> x keysym + +@@ -4376,9 +4372,6 @@ sub print_vector { + my $u = ord (uc (pack ("U", $v))); + my $c = ($v == $l ? $u : $l); + $capsvector[$mask] = $1 ."U+". sprintf ("%04x", $c); +- if ($v != $c && $v gt 0x7f) { +- $broken_caps = 1; +- } + } + } + if ($no_NoSymbol) { +@@ -4776,10 +4769,6 @@ keycode 127 = + die "$0: Unsupported keyboard type $arch\n"; + } + +-if ($broken_caps) { +- $KEYMAP =~ s/Caps_Lock/CtrlL_Lock/g; +-} +- + print $KEYMAP; + + if ($freebsd) { diff --git a/console-setup.spec b/console-setup.spec new file mode 100644 index 0000000..a26566a --- /dev/null +++ b/console-setup.spec @@ -0,0 +1,51 @@ +Name: console-setup +Version: 1.184 +Release: 4 +Summary: Console font and keymap setup program +License: GPLv2+ and MIT and Public Domain +URL: https://packages.debian.org/cs/sid/console-setup +Source0: http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.xz + +Patch0: console-setup-1.76-paths.patch +Patch1: console-setup-1.76-fsf-address.patch +Patch2: console-setup-1.84-ctrll-lock.patch + +BuildArch: noarch +BuildRequires: perl-generators perl(encoding) +Requires: kbd + +%description +This package provides the console with the same keyboard configuration scheme as the X Window System. +As a result, there is no need to duplicate or change the keyboard files just to make simple customizations +such as the use of dead keys, the key functioning as AltGr or Compose key, the key(s) to switch between +Latin and non-Latin mode, etc. + +The package also installs console fonts supporting many of the world's languages. It provides an unified +set of font faces - the classic VGA, the simplistic Fixed, and the cleaned Terminus, TerminusBold and +TerminusBoldVGA. + +%package_help + +%prep +%autosetup -n %{name} -p1 + +%build +make build-linux + +%install +make prefix=%{buildroot} install-linux + +%files +%doc README CHANGES +%license COPYRIGHT copyright.fonts copyright.xkb Fonts/copyright +%exclude %{_sysconfdir}/%{name} +%{_bindir}/* +%config(noreplace) %{_sysconfdir}/default/* +%{_datadir}/console* + +%files help +%{_mandir}/man*/* + +%changelog +* Mon Dec 9 2019 openEuler Buildteam - 1.184-4 +- Package init diff --git a/console-setup_1.184.tar.xz b/console-setup_1.184.tar.xz new file mode 100644 index 0000000..9d31ad6 Binary files /dev/null and b/console-setup_1.184.tar.xz differ