From f7edda7e220c5fda0e972c6e4895c3d01c4b0a6a82f8d66bd832b9c8b642fdc0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 23 Mar 2011 11:14:11 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/mc revision 31.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=607c2e9f4236478789e659497b7ed361 --- mc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mc.spec b/mc.spec index c23bfa6..5dfd70f 100644 --- a/mc.spec +++ b/mc.spec @@ -24,7 +24,7 @@ Group: Productivity/File utilities License: GPLv2+ Url: http://www.ibiblio.org/mc/ Version: 4.7.5.1 -Release: 1 +Release: 7 Source: mc-%{version}.tar.lzma Source1: x11_browser Source2: %{name}.desktop From 11aeb1e7a233f345b0e304143f25be0703a1400e1a23123d02e82a67320fcd0d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 25 Apr 2011 17:25:46 +0000 Subject: [PATCH 2/2] Accepting request 68302 from home:Lazy_Kent:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/68302 OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=27 --- mc.changes | 7 +++++++ mc.spec | 18 +++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mc.changes b/mc.changes index e5bf73c..f430866 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 25 08:25:11 UTC 2011 - lazy.kent@opensuse.org + +- Don't convert Russian and Ukrainian docs. They have been already + in UTF-8 (bnc#686483). +- Install help and hints for non-english locales (bnc#681060). + ------------------------------------------------------------------- Wed Mar 23 08:19:15 UTC 2011 - pcerny@novell.com diff --git a/mc.spec b/mc.spec index 5dfd70f..6bed94c 100644 --- a/mc.spec +++ b/mc.spec @@ -124,8 +124,6 @@ iconv -f iso8859-2 -t utf-8 -o mc.hint.cs.tmp mc.hint.cs && mv mc.hint.cs.tmp mc iconv -f iso8859-2 -t utf-8 -o mc.hint.hu.tmp mc.hint.hu && mv mc.hint.hu.tmp mc.hint.hu iconv -f iso8859-2 -t utf-8 -o mc.hint.pl.tmp mc.hint.pl && mv mc.hint.pl.tmp mc.hint.pl iconv -f iso8859-5 -t utf-8 -o mc.hint.sr.tmp mc.hint.sr && mv mc.hint.sr.tmp mc.hint.sr -iconv -f koi8-r -t utf8 -o mc.hint.ru.tmp mc.hint.ru && mv mc.hint.ru.tmp mc.hint.ru -iconv -f koi8-u -t utf8 -o mc.hint.uk.tmp mc.hint.uk && mv mc.hint.uk.tmp mc.hint.uk iconv -f big5 -t utf8 -o mc.hint.zh.tmp mc.hint.zh && mv mc.hint.zh.tmp mc.hint.zh popd pushd misc @@ -146,15 +144,12 @@ popd pushd pl iconv -f iso8859-2 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in popd -pushd ru -iconv -f koi8-r -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in -popd pushd sr iconv -f iso8859-5 -t utf-8 -o mc.1.in.tmp mc.1.in && mv mc.1.in.tmp mc.1.in iconv -f iso8859-5 -t utf-8 -o mcserv.8.in.tmp mcserv.8.in && mv mcserv.8.in.tmp mcserv.8.in popd # doc/man popd # doc/ -pushd hlp +pushd hlp pushd es iconv -f iso8859-1 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp popd @@ -167,9 +162,6 @@ popd pushd pl iconv -f iso8859-2 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp popd -pushd ru -iconv -f koi8-r -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp -popd pushd sr iconv -f iso8859-5 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp popd # doc/hlp @@ -242,6 +234,9 @@ rm -rf %{buildroot} %exclude %{_sysconfdir}/mc/mc.menu.* %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png + +%files lang -f %{name}.lang +%defattr(-, root, root) %lang(es) %doc %{_mandir}/es %lang(hu) %doc %{_mandir}/hu %lang(it) %doc %{_mandir}/it @@ -254,8 +249,9 @@ rm -rf %{buildroot} %lang(it) %doc %{_datadir}/mc/*/mc.*.it %lang(nl) %doc %{_datadir}/mc/*/mc.*.nl %lang(pl) %doc %{_datadir}/mc/*/mc.*.pl +%lang(ru) %doc %{_datadir}/mc/*/mc.*.ru %lang(sr) %doc %{_datadir}/mc/*/mc.*.sr - -%files lang -f %{name}.lang +%lang(uk) %doc %{_datadir}/mc/*/mc.*.uk +%lang(zh) %doc %{_datadir}/mc/*/mc.*.zh %changelog