--- /dev/null
+diff -ur mc-4.6.2.org/edit/edit.c mc-4.6.2/edit/edit.c
+--- mc-4.6.2.org/edit/edit.c 2009-07-28 21:28:44.818864356 +0200
++++ mc-4.6.2/edit/edit.c 2009-07-28 21:30:46.847810605 +0200
+@@ -188,6 +188,8 @@
+ static const struct edit_filters {
+ const char *read, *write, *extension;
+ } all_filters[] = {
++ { "lzma -cd %s 2>&1", "lzma > %s", ".lzma" },
++ { "xz -cd %s 2>&1", "xz > %s", ".xz" },
+ { "bzip2 -cd %s 2>&1", "bzip2 > %s", ".bz2" },
+ { "gzip -cd %s 2>&1", "gzip > %s", ".gz" },
+ { "gzip -cd %s 2>&1", "gzip > %s", ".Z" }
+diff -ur mc-4.6.2.org/src/util.c mc-4.6.2/src/util.c
+--- mc-4.6.2.org/src/util.c 2009-07-28 21:28:44.862024724 +0200
++++ mc-4.6.2/src/util.c 2009-07-28 21:35:42.938596627 +0200
+@@ -1247,7 +1247,7 @@
+ enum compression_type
+ get_compression_type (int fd)
+ {
+- unsigned char magic[4];
++ unsigned char magic[16];
+
+ /* Read the magic signature */
+ if (mc_read (fd, (char *) magic, 4) != 4)
+@@ -1291,6 +1291,36 @@
+ return COMPRESSION_BZIP2;
+ }
+ }
++
++ /* XZ */
++ if (magic[0] == 0xFD && magic[1] == '7' && magic[2] == 'z'
++ && magic[3] == 'X' && magic[4] == 'Z' && magic[5] == 0x00)
++ return COMPRESSION_XZ;
++
++ /* LZMA files; both LZMA_Alone and LZMA utils formats. The LZMA_Alone
++ * format is used by the LZMA_Alone tool from LZMA SDK. The LZMA utils
++ * format is the default format of LZMA utils 4.32.1 and later. */
++ if (magic[0] < 0xE1 || (magic[0] == 0xFF && magic[1] == 'L' &&
++ magic[2] == 'Z' && magic[3] == 'M')) {
++ if (mc_read (fd, (char *) magic + 4, 9) == 9) {
++ /* LZMA utils format */
++ if (magic[0] == 0xFF && magic[4] == 'A' && magic[5] == 0x00)
++ return COMPRESSION_LZMA;
++ /* The LZMA_Alone format has no magic bytes, thus we
++ * need to play a wizard. This can give false positives,
++ * thus the detection below should be removed when
++ * the newer LZMA utils format has got popular. */
++ if (magic[0] < 0xE1 && magic[4] < 0x20 &&
++ ((magic[10] == 0x00 && magic[11] == 0x00 &&
++ magic[12] == 0x00) ||
++ (magic[5] == 0xFF && magic[6] == 0xFF &&
++ magic[7] == 0xFF && magic[8] == 0xFF &&
++ magic[9] == 0xFF && magic[10] == 0xFF &&
++ magic[11] == 0xFF && magic[12] == 0xFF)))
++ return COMPRESSION_LZMA;
++ }
++ }
++
+ return 0;
+ }
+
+@@ -1301,6 +1331,8 @@
+ case COMPRESSION_GZIP: return "#ugz";
+ case COMPRESSION_BZIP: return "#ubz";
+ case COMPRESSION_BZIP2: return "#ubz2";
++ case COMPRESSION_LZMA: return "#ulzma";
++ case COMPRESSION_XZ: return "#uxz";
+ }
+ /* Should never reach this place */
+ fprintf (stderr, "Fatal: decompress_extension called with an unknown argument\n");
+diff -ur mc-4.6.2.org/src/util.h mc-4.6.2/src/util.h
+--- mc-4.6.2.org/src/util.h 2009-07-28 21:28:44.862024724 +0200
++++ mc-4.6.2/src/util.h 2009-07-28 21:40:19.917753889 +0200
+@@ -185,7 +185,9 @@
+ COMPRESSION_NONE,
+ COMPRESSION_GZIP,
+ COMPRESSION_BZIP,
+- COMPRESSION_BZIP2
++ COMPRESSION_BZIP2,
++ COMPRESSION_LZMA,
++ COMPRESSION_XZ
+ };
+
+ /* Looks for ``magic'' bytes at the start of the VFS file to guess the
+diff -ur mc-4.6.2.org/vfs/extfs/iso9660.in mc-4.6.2/vfs/extfs/iso9660.in
+--- mc-4.6.2.org/vfs/extfs/iso9660.in 2009-02-01 20:30:21.000000000 +0100
++++ mc-4.6.2/vfs/extfs/iso9660.in 2009-07-28 21:36:20.894952063 +0200
+@@ -29,8 +29,10 @@
+ mcisofs_list () {
+ # left as a reminder to implement compressed image support =)
+ case "$1" in
++ *.lzma) MYCAT="lzma -dc";;
+ *.bz2) MYCAT="bzip2 -dc";;
+ *.gz) MYCAT="gzip -dc";;
++ *.xz) MYCAT="xz -dc";;
+ *.z) MYCAT="gzip -dc";;
+ *.Z) MYCAT="gzip -dc";;
+ *) MYCAT="cat";;
+diff -ur mc-4.6.2.org/vfs/extfs/lslR.in mc-4.6.2/vfs/extfs/lslR.in
+--- mc-4.6.2.org/vfs/extfs/lslR.in 2009-02-01 20:30:21.000000000 +0100
++++ mc-4.6.2/vfs/extfs/lslR.in 2009-07-28 21:36:38.021992219 +0200
+@@ -12,8 +12,10 @@
+
+ mclslRfs_list () {
+ case "$1" in
++ *.lzma) MYCAT="lzma -dc";;
+ *.bz2) MYCAT="bzip2 -dc";;
+ *.gz) MYCAT="gzip -dc";;
++ *.xz) MYCAT="xz -dc";;
+ *.z) MYCAT="gzip -dc";;
+ *.Z) MYCAT="gzip -dc";;
+ *) MYCAT="cat";;
+diff -ur mc-4.6.2.org/vfs/extfs/mailfs.in mc-4.6.2/vfs/extfs/mailfs.in
+--- mc-4.6.2.org/vfs/extfs/mailfs.in 2009-02-01 20:30:21.000000000 +0100
++++ mc-4.6.2/vfs/extfs/mailfs.in 2009-07-28 21:37:24.467790210 +0200
+@@ -7,6 +7,8 @@
+
+ $zcat="zcat"; # gunzip to stdout
+ $bzcat="bzip2 -dc"; # bunzip2 to stdout
++$lzcat="lzma -dc"; # unlzma to stdout
++$xzcat="xz -dc"; # unxz to stdout
+ $file="file"; # "file" command
+ $TZ='GMT'; # default timezone (for Date module)
+
+@@ -182,6 +184,10 @@
+ exit 1 unless (open IN, "$zcat $mbox_qname|");
+ } elsif (/bzip/) {
+ exit 1 unless (open IN, "$bzcat $mbox_qname|");
++} elsif (/lzma/) {
++ exit 1 unless (open IN, "$lzcat $mbox_qname|");
++} elsif (/xz/) {
++ exit 1 unless (open IN, "$xzcat $mbox_qname|");
+ } else {
+ exit 1 unless (open IN, "<$mbox_name");
+ }
+diff -ur mc-4.6.2.org/vfs/extfs/patchfs.in mc-4.6.2/vfs/extfs/patchfs.in
+--- mc-4.6.2.org/vfs/extfs/patchfs.in 2009-02-01 20:30:21.000000000 +0100
++++ mc-4.6.2/vfs/extfs/patchfs.in 2009-07-28 21:38:32.688805498 +0200
+@@ -12,6 +12,8 @@
+ use File::Temp 'tempfile';
+
+ # standard binaries
++my $lzma = 'lzma';
++my $xz = 'xz';
+ my $bzip = 'bzip2';
+ my $gzip = 'gzip';
+ my $fileutil = 'file';
+@@ -70,10 +72,14 @@
+ my ($qfname)=(quotemeta $_[0]);
+
+ $_=`$fileutil $qfname`;
+- if (/bzip/) {
++ if (/lzma/) {
++ return "$lzma -dc $qfname";
++ } elsif (/bzip/) {
+ return "$bzip -dc $qfname";
+ } elsif (/gzip/) {
+ return "$gzip -dc $qfname";
++ } elsif (/xz/)
++ return "$xz -dc $qfname";
+ } else {
+ return "cat $qfname";
+ }
+@@ -86,10 +92,14 @@
+ my ($sep) = $append ? '>>' : '>';
+
+ $_=`$fileutil $qfname`;
+- if (/bzip/) {
++ if (/lzma/) {
++ return "$lzma -c $sep $qfname";
++ } elsif (/bzip/) {
+ return "$bzip -c $sep $qfname";
+ } elsif (/gzip/) {
+ return "$gzip -c $sep $qfname";
++ } elsif (/xz/) {
++ return "$xz -c $sep $qfname";
+ } else {
+ return "cat $sep $qfname";
+ }
+diff -ur mc-4.6.2.org/vfs/extfs/sfs.ini mc-4.6.2/vfs/extfs/sfs.ini
+--- mc-4.6.2.org/vfs/extfs/sfs.ini 2009-02-01 20:30:21.000000000 +0100
++++ mc-4.6.2/vfs/extfs/sfs.ini 2009-07-28 21:39:06.275468719 +0200
+@@ -10,6 +10,10 @@
+ ubz/1 bzip -d < %1 > %3
+ bz2/1 bzip2 < %1 > %3
+ ubz2/1 bzip2 -d < %1 > %3
++lzma/1 lzma < %1 > %3
++ulzma/1 lzma -d < %1 > %3
++xz/1 xz < %1 > %3
++uxz/1 xz -d < %1 > %3
+ tar/1 tar cf %3 %1
+ tgz/1 tar czf %3 %1
+ uhtml/1 lynx -force_html -dump %1 > %3
+--- mc-4.6.2/lib/mc.ext.in.org 2009-07-28 21:41:16.635664578 +0200
++++ mc-4.6.2/lib/mc.ext.in 2009-07-28 21:47:46.008125132 +0200
+@@ -119,6 +119,14 @@
+ Open=%cd %p#utar
+ View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
+
++regex/\.t(ar\.xz)$
++ Open=%cd %p#uxz
++ View=%view{ascii} xz -dc %f 2>/dev/null | tar tvvf -
++
++
++
++
++
+ # .tar.F - used in QNX
+ regex/\.tar\.F$
+ # Open=%cd %p#utar
+@@ -181,6 +189,10 @@
+ Open=%cd %p#patchfs
+ View=%view{ascii} bzip2 -dc %f 2>/dev/null
+
++regex/\.(diff|patch)(\.xz)$
++ Open=%cd %p#patchfs
++ View=%view{ascii} xz -dc %f 2>/dev/null
++
+ regex/\.(diff|patch)(\.(gz|Z))$
+ Open=%cd %p#patchfs
+ View=%view{ascii} gzip -dc %f 2>/dev/null
+@@ -555,6 +567,10 @@
+ regex/\.bz2?$
+ View=%view{ascii} bzip2 -dc %f 2>/dev/null
+
++# xz
++regex/\.xz$
++ View=%view{ascii} xz -dc %f 2>/dev/null
++
+ # bzip
+ type/^bzip
+ Open=bzip -dc %f | %var{PAGER:more}
# Conditional build:
%bcond_with ext2undel # with ext2 undelete fs
%bcond_without perl_vfs # without perl depending vfs'es -- to avoid perl autoreq
+%bcond_with mcfs
%bcond_with samba # with SAMBA vfs support
%bcond_without x # without text edit in X support
-%bcond_without utf8 # utf8
#
+%define snap pre2
Summary: A user-friendly file manager and visual shell
Summary(de.UTF-8): Visuelle Shell Midnight Commander
Summary(es.UTF-8): Interpretador de comandos visual Midnight Commander
Summary(uk.UTF-8): Диспетчер файлів Midnight Commander
Summary(zh_CN.UTF-8): 一个方便实用的文件管理器和虚拟Shell
Name: mc
-Version: 4.6.2
-Release: 3
+Version: 4.7.0
+Release: 0.1
License: GPL v2+
Group: Applications/Shells
-Source0: http://www.midnight-commander.org/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: ec92966f4d0c8b50c344fe901859ae2a
+Source0: http://www.midnight-commander.org/downloads/%{name}-%{version}-%{snap}.tar.bz2
+# Source0-md5: 347d0144709ed342302787e314146eef
Source1: %{name}serv.pamd
Source2: %{name}serv.init
Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# at now syntax highligthing for PLD-update-TODO and CVSROOT/users
Patch12: %{name}-pld-developerfriendly.patch
# http://www.midnight-commander.org/downloads/mc-4.6.2-utf8.patch.gz
-Patch13: %{name}-%{version}-utf8.patch
+Patch13: %{name}-4.6.2-utf8.patch
Patch14: %{name}-vhdl-syntax.patch
Patch15: %{name}-ipv6.patch
Patch16: %{name}-refresh.patch
BuildRequires: rpm-perlprov
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
-%if %{with utf8}
-BuildRequires: slang-devel >= 1:2.0.0
-%endif
%ifnarch s390 s390x
BuildRequires: gpm-devel
%endif
тільки власне Midnight Commander).
%prep
-%setup -q -a3 -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q -a3 -n %{name}-%{version}-%{snap}
+# nie naklada sie
+#%patch0 -p1
+# applied
+#%patch1 -p1
%patch2 -p1
cp -f vfs/extfs/{rpm,srpm}
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+# looks applied
+#%patch3 -p1
+# doesn't apply
+#%patch4 -p1
+# doesn't apply
+#%patch5 -p1
%patch6 -p1
%patch7 -p1
-%patch8 -p1
-%patch10 -p1
+# doesn't apply
+#%patch8 -p1
+# doesn't apply
+#%patch10 -p1
%{!?with_perl_vfs:%patch11 -p1}
-%patch12 -p1
+# doesn't apply
+#%patch12 -p1
%if %{with utf8}
-%patch13 -p1
+# doesn't apply
+#%patch13 -p1
%endif
-%patch14 -p1
-%patch15 -p1
+# looks applied
+#%patch14 -p1
+# obsolete
+#%patch15 -p1
%patch16 -p1
-%patch17 -p1
-%patch21 -p1
+# doesn't apply
+#%patch17 -p1
+# doesn't apply
+#%patch21 -p1
%if "%{pld_release}" == "ti"
%patch24 -p1
%endif
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
+# doesn't apply
+#%patch25 -p1
+# looks applied
+#%patch26 -p1
+# obsolete
+#%patch27 -p1
-mv -f po/{no,nb}.po
rm -f po/stamp-po
-%if %{with utf8}
-# convert files in /lib to UTF-8
-cd lib
-for i in mc.hint mc.hint.es mc.hint.it mc.hint.nl; do
- iconv -f iso-8859-1 -t utf-8 < ${i} > ${i}.tmp
- mv -f ${i}.tmp ${i}
-done
-
-for i in mc.hint.cs mc.hint.hu mc.hint.pl; do
- iconv -f iso-8859-2 -t utf-8 < ${i} > ${i}.tmp
- mv -f ${i}.tmp ${i}
-done
-
-for i in mc.hint.sr mc.menu.sr; do
- iconv -f iso-8859-5 -t utf-8 < ${i} > ${i}.tmp
- mv -f ${i}.tmp ${i}
-done
-
-iconv -f koi8-r -t utf8 < mc.hint.ru > mc.hint.ru.tmp
-mv -f mc.hint.ru.tmp mc.hint.ru
-iconv -f koi8-u -t utf8 < mc.hint.uk > mc.hint.uk.tmp
-mv -f mc.hint.uk.tmp mc.hint.uk
-iconv -f big5 -t utf8 < mc.hint.zh > mc.hint.zh.tmp
-mv -f mc.hint.zh.tmp mc.hint.zh
-cd ..
-
-# convert man pages in /doc to UTF-8
-cd doc
-
-cd ru
-for i in mc.1.in xnc.hlp; do
- iconv -f koi8-r -t utf-8 < ${i} > ${i}.tmp
- mv -f ${i}.tmp ${i}
-done
-cd ..
-
-cd sr
-for i in mc.1.in mcserv.8.in xnc.hlp; do
- iconv -f iso-8859-5 -t utf-8 < ${i} > ${i}.tmp
- mv -f ${i}.tmp ${i}
-done
-cd ..
-
-for d in es it; do
- for i in mc.1.in xnc.hlp; do
- iconv -f iso-8859-3 -t utf-8 < ${d}/${i} > ${d}/${i}.tmp
- mv -f ${d}/${i}.tmp ${d}/${i}
- done
-done
-
-for d in hu pl; do
- for i in mc.1.in xnc.hlp; do
- iconv -f iso-8859-2 -t utf-8 < ${d}/${i} > ${d}/${i}.tmp
- mv -f ${d}/${i}.tmp ${d}/${i}
- done
-done
-cd ..
-%endif
-
-rm -f syntax/Syntax.orig
sed -i 's:|hxx|:|hh|hpp|hxx|tcc|:' syntax/Syntax
%build
fi;
fi"
-%if %{with utf8}
-CFLAGS="-DUTF8 %{rpmcflags}"
-export CFLAGS
-%endif
%configure \
+ CPPFLAGS="%{rpmcppflags} -I/usr/include/ncursesw" \
--enable-dependency-tracking \
--enable-charset \
--with%{!?debug:out}-debug \
--with%{!?with_ext2undel:out}-ext2undel \
--with%{!?with_x:out}-x \
--with-vfs \
- --with-mcfs \
+ %{?with_mcfs:--enable-vfs-mcfs} \
%{?with_samba:--with-samba} \
--with-configdir=/etc/samba \
--with-codepagedir=/etc/samba/codepages \
--with-gpm-mouse \
- --with-screen=%{?!with_utf8:mc}slang \
+ --with-screen=ncurses \
--with-edit
%{__make}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install doc/mcserv.8 $RPM_BUILD_ROOT%{_mandir}/man8
-
install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/mcserv
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mcserv
install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/mcserv
done
done
-install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT/etc/shrc.d
+install contrib/{mc.sh,mc.csh} $RPM_BUILD_ROOT/etc/shrc.d
%find_lang %{name}
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc FAQ NEWS README
+%doc NEWS README
%attr(755,root,root) %{_bindir}/mc*
%config /etc/shrc.d/*
%attr(755,root,root) %{_libdir}/mc/cons.saver
%dir %{_libdir}/mc
-
+%attr(755,root,root) %{_libdir}/mc/*.sh
+%attr(755,root,root) %{_libdir}/mc/*.csh
%dir %{_datadir}/mc
-%{_datadir}/mc/bin
%{_datadir}/mc/syntax
-%{_datadir}/mc/mc.ext
-%{_datadir}/mc/cedit*
-%{_datadir}/mc/edit.*
%{_datadir}/mc/mc.hlp
%lang(es) %{_datadir}/mc/mc.hlp.es
%lang(hu) %{_datadir}/mc/mc.hlp.hu
%lang(pl) %{_datadir}/mc/mc.hlp.pl
%lang(ru) %{_datadir}/mc/mc.hlp.ru
%lang(sr) %{_datadir}/mc/mc.hlp.sr
-%{_datadir}/mc/mc.lib
-%{_datadir}/mc/mc.menu
%lang(sr) %{_datadir}/mc/mc.menu.sr
%{_datadir}/mc/mc.hint
%lang(cs) %{_datadir}/mc/mc.hint.cs
%dir %{_datadir}/mc/extfs
%{_datadir}/mc/extfs/README
-%{_datadir}/mc/extfs/extfs.ini
-%{_datadir}/mc/extfs/sfs.ini
%if %{with perl_vfs}
%attr(755,root,root) %{_datadir}/mc/extfs/a
%attr(755,root,root) %{_datadir}/mc/extfs/apt
%attr(755,root,root) %{_datadir}/mc/extfs/deb*
%attr(755,root,root) %{_datadir}/mc/extfs/dpkg
-#%attr(755,root,root) %{_datadir}/mc/extfs/ftplist
%attr(755,root,root) %{_datadir}/mc/extfs/mailfs
%attr(755,root,root) %{_datadir}/mc/extfs/patchfs
%attr(755,root,root) %{_datadir}/mc/extfs/rpms
-#%attr(755,root,root) %{_datadir}/mc/extfs/ucpio
%attr(755,root,root) %{_datadir}/mc/extfs/uzip
%endif
%attr(755,root,root) %{_datadir}/mc/extfs/audio
%attr(755,root,root) %{_datadir}/mc/extfs/u7z
%attr(755,root,root) %{_datadir}/mc/extfs/ualz
%attr(755,root,root) %{_datadir}/mc/extfs/uar*
+%attr(755,root,root) %{_datadir}/mc/extfs/uace
+%attr(755,root,root) %{_datadir}/mc/extfs/uc1541
%attr(755,root,root) %{_datadir}/mc/extfs/uha
%attr(755,root,root) %{_datadir}/mc/extfs/ulha
%attr(755,root,root) %{_datadir}/mc/extfs/urar
%{_desktopdir}/mc.desktop
%{_pixmapsdir}/mc.png
-%{_datadir}/mc/mc.charsets
-
%{_mandir}/man1/*
%lang(es) %{_mandir}/es/man1/*
%lang(hu) %{_mandir}/hu/man1/*
%lang(ru) %{_mandir}/ru/man1/*
%lang(sr) %{_mandir}/sr/man1/*
+%dir %{_sysconfdir}/mc
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/mc/Syntax
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/mc/*.*
+%dir %{_sysconfdir}/mc/extfs
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/mc/extfs/*.*
+
+%if %{with mcfs}
%files -n mcserv
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
%lang(pl) %{_mandir}/pl/man8/mcserv.8*
%lang(sr) %{_mandir}/sr/man8/mcserv.8*
%attr(755,root,root) %{_sbindir}/mcserv
+%endif
projects / packages / mc.git / commitdiff