From 36567aab092ede560a2208762295fb77bf94e82c Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Nov 08 2004 11:19:16 +0000 Subject: - update from CVS - convert help files in /doc to UTF-8 - add --enable-charsets (#76486) - drop upstreamed 8bitdefault, extfs patch - update partially upstreamed strippwd and extension patches - add UTF-8 help patch from Vladimir Nadvornik (#136826) - add promptfix patch - drop upstreamed smallpatches patch - install non-en man pages and fix encoding (#137036) - fix possible mem leak in strippwd patch --- diff --git a/.cvsignore b/.cvsignore index 0295abd..ebc3645 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ mc-4.6.1-20040906.tar.bz2 mc-4.6.1-20041008.tar.bz2 mc-4.6.1-20041015.tar.bz2 mc-4.6.1-20041020.tar.bz2 +mc-4.6.1-20041108.tar.bz2 diff --git a/mc.spec b/mc.spec index e033bb5..82805c2 100644 --- a/mc.spec +++ b/mc.spec @@ -1,12 +1,12 @@ Summary: User-friendly text console file manager and visual shell. Name: mc Version: 4.6.1 -Release: 0.8 +Release: 0.9 Epoch: 1 License: GPL Group: System Environment/Shells #Source0: http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-%{version}.tar.gz -%define date 20041020 +%define date 20041108 Source0: mc-%{version}-%{date}.tar.bz2 URL: http://www.ibiblio.org/mc/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -14,16 +14,15 @@ BuildRequires: gpm-devel, slang-devel, glib2-devel BuildRequires: XFree86-devel, e2fsprogs-devel, gettext, gettext-devel Requires: dev >= 0:3.3-3 -Patch1: mc-CVS-smallpatches.patch -Patch2: mc-CVS-utf8.patch -Patch3: mc-CVS-utf8-fix.patch -Patch4: mc-CVS-utf8-hint.patch -Patch5: mc-CVS-utf8-input.patch +Patch1: mc-CVS-utf8.patch +Patch2: mc-CVS-utf8-fix.patch +Patch3: mc-CVS-utf8-hint.patch +Patch4: mc-CVS-utf8-input.patch +Patch5: mc-CVS-utf8-help.patch Patch6: mc-CVS-uglydir.patch Patch7: mc-CVS-strippwd.patch Patch8: mc-CVS-extensions.patch -Patch9: mc-CVS-extfs.patch -Patch10: mc-CVS-8bitdefault.patch +Patch9: mc-CVS-promptfix.patch %description Midnight Commander is a visual shell much like a file manager, only @@ -35,18 +34,17 @@ poke into RPMs for specific files. %prep %setup -q -n mc-%{version}-%{date} -%patch1 -p1 -b .smallpatches -%patch2 -p1 -b .utf8 -%patch3 -p1 -b .utf8-fix -%patch4 -p1 -b .utf8-hint -%patch5 -p1 -b .utf8-input +%patch1 -p1 -b .utf8 +%patch2 -p1 -b .utf8-fix +%patch3 -p1 -b .utf8-hint +%patch4 -p1 -b .utf8-input +%patch5 -p1 -b .utf8-help %patch6 -p1 -b .uglydir %patch7 -p1 -b .strippwd %patch8 -p1 -b .extensions -%patch9 -p1 -b .extfs -%patch10 -p1 -b .8bitdefault +%patch9 -p1 -b .promptfix -# convert original files to UTF8 +# convert files in /lib to UTF-8 pushd lib iconv -f iso8859-1 -t utf-8 -o mc.hint.tmp mc.hint && mv mc.hint.tmp mc.hint iconv -f iso8859-1 -t utf-8 -o mc.hint.es.tmp mc.hint.es && mv mc.hint.es.tmp mc.hint.es @@ -56,10 +54,45 @@ 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 koi8-r -t utf8 -o mc.hint.ru.tmp mc.hint.ru && mv mc.hint.ru.tmp mc.hint.ru -iconv -f koi8-r -t utf8 -o mc.hint.uk.tmp mc.hint.uk && mv mc.hint.uk.tmp mc.hint.uk +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 +# convert help files in /doc to UTF-8 +pushd doc + +# es +pushd es +iconv -f windows-1252 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp +popd + +# hu +pushd hu +iconv -f windows-1252 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp +popd + +# it +pushd it +iconv -f windows-1252 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp +popd + +# pl +pushd pl +iconv -f iso8859-2 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp +popd + +# ru +pushd ru +iconv -f koi8-r -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp +popd + +# sr +pushd sr +iconv -f iso8859-5 -t utf-8 -o xnc.hlp.tmp xnc.hlp && mv xnc.hlp.tmp xnc.hlp +popd + +popd + %build export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS" #%%configure --sysconfdir=%{_sysconfdir} --with-screen=slang @@ -79,7 +112,8 @@ export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS" --localstatedir=%{_localstatedir} \ --sharedstatedir=%{_sharedstatedir} \ --mandir=%{_mandir} \ - --infodir=%{_infodir} + --infodir=%{_infodir} \ + --enable-charset make %{?_smp_mflags} %install @@ -93,6 +127,40 @@ install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d # no longer works for 4.6.0, need to evaluate ## install -m 644 lib/mc.global $RPM_BUILD_ROOT%{_sysconfdir} +# install charsets, bug #76486 +install -m 644 lib/mc.charsets $RPM_BUILD_ROOT%{_datadir}/mc + +# install man pages in various languages +mkdir -p $RPM_BUILD_ROOT%{_mandir}/es +mkdir -p $RPM_BUILD_ROOT%{_mandir}/es/man1 +gzip -nf9 doc/es/mc.1 +install -m 644 doc/es/mc.1.gz $RPM_BUILD_ROOT%{_mandir}/es/man1 + +mkdir -p $RPM_BUILD_ROOT%{_mandir}/hu +mkdir -p $RPM_BUILD_ROOT%{_mandir}/hu/man1 +gzip -nf9 doc/hu/mc.1 +install -m 644 doc/hu/mc.1.gz $RPM_BUILD_ROOT%{_mandir}/hu/man1 + +mkdir -p $RPM_BUILD_ROOT%{_mandir}/it +mkdir -p $RPM_BUILD_ROOT%{_mandir}/it/man1 +gzip -nf9 doc/it/mc.1 +install -m 644 doc/it/mc.1.gz $RPM_BUILD_ROOT%{_mandir}/it/man1 + +mkdir -p $RPM_BUILD_ROOT%{_mandir}/pl +mkdir -p $RPM_BUILD_ROOT%{_mandir}/pl/man1 +gzip -nf9 doc/pl/mc.1 +install -m 644 doc/pl/mc.1.gz $RPM_BUILD_ROOT%{_mandir}/pl/man1 + +mkdir -p $RPM_BUILD_ROOT%{_mandir}/ru +mkdir -p $RPM_BUILD_ROOT%{_mandir}/ru/man1 +gzip -nf9 doc/ru/mc.1 +install -m 644 doc/ru/mc.1.gz $RPM_BUILD_ROOT%{_mandir}/ru/man1 + +mkdir -p $RPM_BUILD_ROOT%{_mandir}/sr +mkdir -p $RPM_BUILD_ROOT%{_mandir}/sr/man1 +gzip -nf9 doc/sr/mc.1 +install -m 644 doc/sr/mc.1.gz $RPM_BUILD_ROOT%{_mandir}/sr/man1 + for I in /etc/pam.d/mcserv \ /etc/rc.d/init.d/mcserv \ /etc/mc.global; do @@ -115,11 +183,31 @@ rm -rf $RPM_BUILD_ROOT %attr(4711, vcsa, root) %{_libdir}/mc/cons.saver %{_mandir}/man1/* %{_mandir}/man3/* +%lang(es) %{_mandir}/es/man1/mc.1.gz +%lang(hu) %{_mandir}/hu/man1/mc.1.gz +%lang(it) %{_mandir}/it/man1/mc.1.gz +%lang(pl) %{_mandir}/pl/man1/mc.1.gz +%lang(ru) %{_mandir}/ru/man1/mc.1.gz +%lang(sr) %{_mandir}/sr/man1/mc.1.gz %config %{_sysconfdir}/profile.d/* %dir %{_libdir}/mc %dir %{_datadir}/mc %changelog +* Thu Nov 8 2004 Jindrich Novy 4.6.1-0.9 +- update from CVS +- convert help files in /doc to UTF-8 +- add --enable-charsets (#76486) +- drop upstreamed 8bitdefault, extfs patch +- update partially upstreamed strippwd and extension patches +- add UTF-8 help patch from Vladimir Nadvornik (#136826) +- add promptfix patch + +* Wed Nov 3 2004 Jindrich Novy +- drop upstreamed smallpatches patch +- install non-en man pages and fix encoding (#137036) +- fix possible mem leak in strippwd patch + * Fri Oct 22 2004 Jindrich Novy - drop second part of the uglydir patch to display panel title correctly in UTF8 (#136129) diff --git a/sources b/sources index 8fe6209..c2fdbfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f6c3f24832a00083006a81d9c273870 mc-4.6.1-20041020.tar.bz2 +bc18a53335fe1ad6054b30d472be2497 mc-4.6.1-20041108.tar.bz2