Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2020-04-27 23:29:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbd" Mon Apr 27 23:29:25 2020 rev:96 rq:796365 version:2.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2020-03-08 22:23:39.224059555 +0100 +++ /work/SRC/openSUSE:Factory/.kbd.new.2738/kbd.changes 2020-04-27 23:29:27.338478260 +0200 @@ -1,0 +2,7 @@ +Tue Apr 21 13:08:11 UTC 2020 - Ludwig Nussel <[email protected]> + +- drop broken kbd command as well as guess_encoding (boo#1170067) +- don't use subdirectory for legacy keymaps (boo#1166423) +- use fdupes + +------------------------------------------------------------------- Old: ---- guess_encoding.pl kbd.pl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.bmVx07/_old 2020-04-27 23:29:30.218483883 +0200 +++ /var/tmp/diff_new_pack.bmVx07/_new 2020-04-27 23:29:30.222483890 +0200 @@ -21,6 +21,8 @@ %define _fillupdir /var/adm/fillup-templates %endif +%define legacy_folders amiga,atari,i386,include,mac,ppc,sun + Name: kbd Version: 2.2.0 Release: 0 @@ -41,8 +43,6 @@ Source9: sysconfig.keyboard Source11: fbtest.c Source12: fbtest.8 -Source13: guess_encoding.pl -Source14: kbd.pl Source15: cz-map.patch Source20: kbdsettings Source21: kbdsettings.service @@ -73,6 +73,7 @@ BuildRequires: bison BuildRequires: check-devel BuildRequires: console-setup +BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc >= 4.6 BuildRequires: pam-devel @@ -278,8 +279,6 @@ install -d %{buildroot}%{_distconfdir}/pam.d install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/vlock install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/ -install -m 755 %{SOURCE13} %{buildroot}%{_bindir}/guess_encoding -install -m 755 %{SOURCE14} %{buildroot}%{_bindir}/kbd #UsrMerge mkdir -p %{buildroot}/bin mkdir -p %{buildroot}/sbin @@ -289,7 +288,6 @@ 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 @@ -326,10 +324,6 @@ %endif #EndUsrMerge -# Move original keymaps to legacy directory -mkdir -p %{buildroot}%{kbd}/keymaps/legacy -mv %{buildroot}%{kbd}/keymaps/{amiga,atari,i386,include,mac,ppc,sun} %{buildroot}%{kbd}/keymaps/legacy - # Make sure Perl has a locale where uc/lc works for unicode codepoints # see e.g. https://perldoc.perl.org/perldiag.html#Wide-character-(U%2b%25X)-in-%25s export LC_ALL=C.utf-8 @@ -373,6 +367,8 @@ install -d %{buildroot}%{_prefix}/lib/systemd/system install -m0644 kbdsettings.service %{buildroot}%{_prefix}/lib/systemd/system +%fdupes -s %{buildroot}%{_datadir} + %find_lang %{name} %pre @@ -412,7 +408,7 @@ %{_fillupdir}/sysconfig.console %{_fillupdir}/sysconfig.keyboard %{kbd} -%exclude %{kbd}/keymaps/legacy +%exclude %{kbd}/keymaps/{%{legacy_folders}} #UsrMerge /sbin/fbtest /bin/chvt @@ -445,7 +441,6 @@ /bin/unicode_start /bin/unicode_stop /bin/kbdrate -/bin/guess_encoding /bin/clrunimap /bin/getunimap /bin/outpsfheader @@ -487,8 +482,6 @@ %{_bindir}/unicode_start %{_bindir}/unicode_stop %{_bindir}/kbdrate -%{_bindir}/guess_encoding -%{_bindir}/kbd %{_bindir}/clrunimap %{_bindir}/getunimap %{_bindir}/outpsfheader @@ -532,6 +525,6 @@ %{_sbindir}/kbdsettings %files legacy -%{kbd}/keymaps/legacy +%{kbd}/keymaps/{%{legacy_folders}} %changelog
