Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2014-04-03 16:38:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2014-03-01 14:38:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2014-04-03 16:38:50.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Apr 1 09:39:40 CEST 2014 - [email protected] + +- do not package keyboard.desktop file for s390 (bnc#870953) +- 3.1.6 + +------------------------------------------------------------------- +Wed Mar 26 11:26:33 CET 2014 - [email protected] + +- Reference to obsoleted Sax removed from help text (bnc#869397) +- 3.1.5 + +------------------------------------------------------------------- Old: ---- yast2-country-3.1.4.tar.bz2 New: ---- yast2-country-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.K7B3o5/_old 2014-04-03 16:38:51.000000000 +0200 +++ /var/tmp/diff_new_pack.K7B3o5/_new 2014-04-03 16:38:51.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.4 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -100,6 +100,10 @@ %install %yast_install +%ifarch s390 s390x +rm -f $RPM_BUILD_ROOT%{yast_desktopdir}/keyboard.desktop +%endif + # Policies mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/actions install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ @@ -124,7 +128,9 @@ %{yast_schemadir}/autoyast/rnc/*.rnc %{yast_desktopdir}/yast-language.desktop %{yast_desktopdir}/timezone.desktop +%ifnarch s390 s390x %{yast_desktopdir}/keyboard.desktop +%endif %dir /usr/share/polkit-1 %dir /usr/share/polkit-1/actions %attr(644,root,root) %config /usr/share/polkit-1/actions/org.opensuse.yast.modules.yapi.*.policy ++++++ yast2-country-3.1.4.tar.bz2 -> yast2-country-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.4/keyboard/src/include/keyboard/dialogs.rb new/yast2-country-3.1.6/keyboard/src/include/keyboard/dialogs.rb --- old/yast2-country-3.1.4/keyboard/src/include/keyboard/dialogs.rb 2014-02-28 17:20:50.000000000 +0100 +++ new/yast2-country-3.1.6/keyboard/src/include/keyboard/dialogs.rb 2014-04-01 10:04:47.000000000 +0200 @@ -58,7 +58,7 @@ ) + # help text for keyboard expert screen cont. _( - "<p>Settings made here apply only to the console keyboard. Configure the keyboard for the graphical user interface with another tool, such as SaX.</p>\n" + "<p>Settings made here apply only to the console keyboard. Configure the keyboard for the graphical user interface with another tool.</p>\n" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.4/package/yast2-country.changes new/yast2-country-3.1.6/package/yast2-country.changes --- old/yast2-country-3.1.4/package/yast2-country.changes 2014-02-28 17:20:50.000000000 +0100 +++ new/yast2-country-3.1.6/package/yast2-country.changes 2014-04-01 10:04:48.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Apr 1 09:39:40 CEST 2014 - [email protected] + +- do not package keyboard.desktop file for s390 (bnc#870953) +- 3.1.6 + +------------------------------------------------------------------- +Wed Mar 26 11:26:33 CET 2014 - [email protected] + +- Reference to obsoleted Sax removed from help text (bnc#869397) +- 3.1.5 + +------------------------------------------------------------------- Fri Feb 28 14:13:07 CET 2014 - [email protected] - only KEYMAP belongs to /etc/vconsole.conf (bnc#861819) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.4/package/yast2-country.spec new/yast2-country-3.1.6/package/yast2-country.spec --- old/yast2-country-3.1.4/package/yast2-country.spec 2014-02-28 17:20:50.000000000 +0100 +++ new/yast2-country-3.1.6/package/yast2-country.spec 2014-04-01 10:04:48.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.4 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -90,6 +90,10 @@ %install %yast_install +%ifarch s390 s390x +rm -f $RPM_BUILD_ROOT%{yast_desktopdir}/keyboard.desktop +%endif + # Policies mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/actions install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ @@ -115,7 +119,9 @@ %{yast_schemadir}/autoyast/rnc/*.rnc %{yast_desktopdir}/yast-language.desktop %{yast_desktopdir}/timezone.desktop +%ifnarch s390 s390x %{yast_desktopdir}/keyboard.desktop +%endif %dir /usr/share/polkit-1 %dir /usr/share/polkit-1/actions %attr(644,root,root) %config /usr/share/polkit-1/actions/org.opensuse.yast.modules.yapi.*.policy -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
