.../tags/4b0fbb7060359954c4d27a99d5ec6a9c31a7d5b4 | 13 ++++++ .../tags/efae6792b00275513cf0cb8f31fe09660e48eef3 | 13 ------ .gear/tags/list | 2 +- alt-patches/mc-4.7.5.5-ftpspaces.patch | 13 ------ mc.spec | 43 +++++++++++++++---- 5 files changed, 48 insertions(+), 36 deletions(-) diff --git a/.gear/tags/4b0fbb7060359954c4d27a99d5ec6a9c31a7d5b4 b/.gear/tags/4b0fbb7060359954c4d27a99d5ec6a9c31a7d5b4 new file mode 100644 index 0000000..7b17282 --- /dev/null +++ b/.gear/tags/4b0fbb7060359954c4d27a99d5ec6a9c31a7d5b4 @@ -0,0 +1,13 @@ +object 8131bde07f4a1e6af68b772e6969c4e26455c672 +type commit +tag 4.7.5.6 +tagger Sergey Y. Afonin 1325886168 +0400 + +4.7.5.6 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAk8HatgACgkQ9lmILNBvYfuBDgCdFn9uxpmwixKp/lA6DzbEDfe5 +3SgAnjcKBjsS+sjtHCshkSI/mS8HvRXW +=4Mmz +-----END PGP SIGNATURE----- diff --git a/.gear/tags/efae6792b00275513cf0cb8f31fe09660e48eef3 b/.gear/tags/efae6792b00275513cf0cb8f31fe09660e48eef3 deleted file mode 100644 index 6c1efb2..0000000 --- a/.gear/tags/efae6792b00275513cf0cb8f31fe09660e48eef3 +++ /dev/null @@ -1,13 +0,0 @@ -object b027ff8cf8c47b40163b8344f9f690ab236dec03 -type commit -tag 4.7.5.5 -tagger Sergey Y. Afonin 1319046600 +0400 - -4.7.5.5 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAk6fDcgACgkQ9lmILNBvYfs6HACfeN0XC+vpOCzcw+TfUT6BzoVo -vXUAmwUJPMLrQaRTFcXTDkUSMl/btD1H -=zvVs ------END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list index 32e4208..2eb5cf4 100644 --- a/.gear/tags/list +++ b/.gear/tags/list @@ -1 +1 @@ -efae6792b00275513cf0cb8f31fe09660e48eef3 4.7.5.5 +4b0fbb7060359954c4d27a99d5ec6a9c31a7d5b4 4.7.5.6 diff --git a/alt-patches/mc-4.7.5.5-ftpspaces.patch b/alt-patches/mc-4.7.5.5-ftpspaces.patch deleted file mode 100644 index e71914b..0000000 --- a/alt-patches/mc-4.7.5.5-ftpspaces.patch +++ /dev/null @@ -1,13 +0,0 @@ -Set better default value for RFC_STRICT servers that do not show ".." in LIST -diff -urN mc-4.7.5.5.orig/lib/vfs/mc-vfs/parse_ls_vga.c mc-4.7.5.5/lib/vfs/mc-vfs/parse_ls_vga.c ---- mc-4.7.5.5.orig/lib/vfs/mc-vfs/parse_ls_vga.c 2011-09-28 12:49:09.000000000 -0400 -+++ mc-4.7.5.5/lib/vfs/mc-vfs/parse_ls_vga.c 2011-10-19 13:14:30.000000000 -0400 -@@ -648,7 +648,7 @@ - void - vfs_parse_ls_lga_init (void) - { -- vfs_parce_ls_final_num_spaces = 0; -+ vfs_parce_ls_final_num_spaces = 1; - } - - /* --------------------------------------------------------------------------------------------- */ diff --git a/mc.spec b/mc.spec index b1134e9..e4e65cf 100644 --- a/mc.spec +++ b/mc.spec @@ -1,6 +1,6 @@ Name: mc -Version: 4.7.5.5 -Release: alt3 +Version: 4.7.5.6 +Release: alt0.M51.1 License: %gpllgpl2plus Summary: An user-friendly file manager and visual shell @@ -34,9 +34,6 @@ Patch51: mc-4.7.0-debian-mc.ext-use-arj.patch # https://savannah.gnu.org/patch/?4211 Patch101: mc-4.7.0.2-savannah-edit-homekey.patch -#Errata -Patch500: mc-4.7.5.5-ftpspaces.patch - BuildRequires(pre): rpm-build-licenses Conflicts: %name-data @@ -47,6 +44,8 @@ Obsoletes: %name-data Obsoletes: %name-locales Obsoletes: %name-doc +Obsoletes: mc47 + BuildPreReq: glib2-devel libe2fs-devel libgpm-devel BuildPreReq: groff-base cvs libX11-devel unzip BuildPreReq: libslang2-devel @@ -98,9 +97,6 @@ needed for working all components (some vfs for example) # Misc %patch101 -p1 -#Errata -%patch500 -p1 - cat < version.h #ifndef MC_CURRENT_VERSION #define MC_CURRENT_VERSION "@@VERSION@@" @@ -130,7 +126,7 @@ rm -rf lib/vfs/mc-vfs/samba/ install -d %buildroot%_sysconfdir/{profile.d,bashrc.d} mv %buildroot%_libexecdir/mc/mc.csh %buildroot%_sysconfdir/profile.d/ mv %buildroot%_libexecdir/mc/mc.sh %buildroot%_sysconfdir/bashrc.d/ -install -m755 %SOURCE6 %buildroot%_sysconfdir/profile.d/mc.sh +#install -m755 %SOURCE6 %buildroot%_sysconfdir/profile.d/mc.sh # Install DosNavigator color scheme install -m644 %SOURCE2 . # Install Dark color scheme @@ -193,16 +189,35 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png %files full %changelog +* Wed Jan 11 2012 Sergey Y. Afonin 4.7.5.6-alt0.M51.1 +- Branch 5.1 backport + +* Sat Jan 07 2012 Sergey Y. Afonin 4.7.5.6-alt1 +- 4.7.5.6 + +* Sat Oct 22 2011 Sergey Y. Afonin 4.7.5.5-alt0.M51.3 +- Branch 5.1 backport + * Sat Oct 22 2011 Sergey Y. Afonin 4.7.5.5-alt3 - applied fix from #2635 +* Thu Oct 20 2011 Sergey Y. Afonin 4.7.5.5-alt0.M51.2 +- Branch 5.1 backport + * Thu Oct 20 2011 Sergey Y. Afonin 4.7.5.5-alt2 - fixed output of version string (typo in spec of 4.7.5.5-alt1) +* Wed Oct 19 2011 Sergey Y. Afonin 4.7.5.5-alt0.M51.1 +- Branch 5.1 backport + * Wed Oct 19 2011 Sergey Y. Afonin 4.7.5.5-alt1 - 4.7.5.5 - disabled rollback for #81 +* Tue Aug 23 2011 Sergey Y. Afonin 4.7.5.3-alt0.M51.3 +- Branch 5.1 backport +- disabled separated alias definition for zsh + * Tue Aug 23 2011 Sergey Y. Afonin 4.7.5.3-alt3 - moved mc.sh back to bashrc.d (ALT #25703/c#3) - added alias definition for zsh in profile.d (ALT #25703) @@ -211,6 +226,9 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png * Tue Aug 09 2011 Sergey Y. Afonin 4.7.5.3-alt2 - moved mc.sh from bashrc.d to profile.d (ALT #25703) +* Mon Aug 08 2011 Sergey Y. Afonin 4.7.5.3-alt0.M51.1 +- Branch 5.1 backport + * Mon Aug 08 2011 Sergey Y. Afonin 4.7.5.3-alt1 - 4.7.5.3 @@ -229,6 +247,10 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png mc-4.7.0-alt-po.patch mc-4.7.0-alt-defaults.patch +* Sat Dec 25 2010 Sergey Y. Afonin 4.7.0.10-alt0.M51.5 +- Branch 5.1 update +- added "mc47" to "Obsoletes" + * Tue Dec 21 2010 Sergey Y. Afonin 4.7.0.10-alt5 - fixed processing of ";1" in some ISO images (closes: #12299) @@ -257,6 +279,9 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png - disabled mc-4.7.0.2-alt-esc.patch (not needed now) - added cdrkit-utils to "Requires" (closes: #24662) +* Wed Sep 01 2010 Radik Usupov 4.7.0.2-alt0.M51.2 +- Build for branch 5.1 + * Thu Feb 25 2010 Andrey Rahmatullin 4.7.0.2-alt2 - 4.7.0.2-37-ge0030fd (closes: #22979)