Hello community,

here is the log from the commit of package kbd for openSUSE:Factory checked in 
at 2020-11-29 12:20:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
 and      /work/SRC/openSUSE:Factory/.kbd.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kbd"

Sun Nov 29 12:20:31 2020 rev:103 rq:850974 version:2.3.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes  2020-10-03 18:53:52.245373347 
+0200
+++ /work/SRC/openSUSE:Factory/.kbd.new.5913/kbd.changes        2020-11-29 
12:20:34.521525622 +0100
@@ -1,0 +2,5 @@
+Fri Oct 16 09:58:12 UTC 2020 - Ludwig Nussel <[email protected]>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kbd.spec ++++++
--- /var/tmp/diff_new_pack.XDtnM4/_old  2020-11-29 12:20:35.413526524 +0100
+++ /var/tmp/diff_new_pack.XDtnM4/_new  2020-11-29 12:20:35.413526524 +0100
@@ -285,7 +285,7 @@
 install -d %{buildroot}%{_distconfdir}/pam.d
 install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/vlock
 install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
-#UsrMerge
+%if !0%{?usrmerged}
 mkdir -p %{buildroot}/bin
 mkdir -p %{buildroot}/sbin
 ln -s %{_bindir}/chvt %{buildroot}/bin
@@ -328,7 +328,7 @@
 %ifarch %{ix86} x86_64
 ln -s %{_bindir}/resizecons %{buildroot}/bin
 %endif
-#EndUsrMerge
+%endif
 
 # 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
@@ -415,7 +415,7 @@
 %{_fillupdir}/sysconfig.keyboard
 %{kbd}
 %exclude %{kbd}/keymaps/{%{legacy_folders}}
-#UsrMerge
+%if !0%{?usrmerged}
 /sbin/fbtest
 /bin/chvt
 /bin/openvt
@@ -456,7 +456,7 @@
 /bin/setvesablank
 /bin/spawn_console
 /bin/spawn_login
-#EndUsrMerge
+%endif
 %{_sbindir}/fbtest
 %{_bindir}/chvt
 %{_bindir}/openvt
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives: 
https://lists.opensuse.org/archives/list/[email protected]

Reply via email to