ALT Linux Sisyphus

.../tags/2acb1c33ea45a79f9306ec11051e4f7f9d05efcd  | 13 ----
 .../tags/44e8a9f9942a56d10ca5a6425ed9c898d1e7e89d  | 13 ++++
 .gear/tags/list                                    |  2 +-
 alt-patches/mc-4.8.6-alt-extfs-rpm.patch           | 43 -------------
 ...2dc152480607eaca220284330f10a0864a492-man.patch | 73 ----------------------
 mc.spec                                            | 51 +++++++++++----
 6 files changed, 53 insertions(+), 142 deletions(-)

diff --git a/.gear/tags/2acb1c33ea45a79f9306ec11051e4f7f9d05efcd b/.gear/tags/2acb1c33ea45a79f9306ec11051e4f7f9d05efcd
deleted file mode 100644
index 2473ae5..0000000
--- a/.gear/tags/2acb1c33ea45a79f9306ec11051e4f7f9d05efcd
+++ /dev/null
@@ -1,13 +0,0 @@
-object b56fe795e49e2bd5f276daa91c6019dfc1010ae6
-type commit
-tag 4.8.8
-tagger Sergey Y. Afonin <asy@altlinux.org> 1365364116 +0400
-
-4.8.8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.13 (GNU/Linux)
-
-iEYEABECAAYFAlFhzZQACgkQ9lmILNBvYftrkwCfU0qI8hLVNWfafTcIkSBxohB9
-H10An02Ihh1Ym9d4jbA0QXjz1beogxYV
-=svS+
------END PGP SIGNATURE-----
diff --git a/.gear/tags/44e8a9f9942a56d10ca5a6425ed9c898d1e7e89d b/.gear/tags/44e8a9f9942a56d10ca5a6425ed9c898d1e7e89d
new file mode 100644
index 0000000..a700003
--- /dev/null
+++ b/.gear/tags/44e8a9f9942a56d10ca5a6425ed9c898d1e7e89d
@@ -0,0 +1,13 @@
+object 319091c7183a4bf5724e02ca759b150b89a9bcd4
+type commit
+tag 4.8.11
+tagger Sergey Y. Afonin <asy@altlinux.org> 1386109928 +0400
+
+4.8.11
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.13 (GNU/Linux)
+
+iEYEABECAAYFAlKeW+gACgkQ9lmILNBvYfuxawCeNodxNRYStUlhyiZGHYLk+aM0
+KNQAnjNNoWMmlJewS+NvHe1iE6mJhzht
+=GTLZ
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/list b/.gear/tags/list
index 5b2ea5a..1c8b702 100644
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-2acb1c33ea45a79f9306ec11051e4f7f9d05efcd 4.8.8
+44e8a9f9942a56d10ca5a6425ed9c898d1e7e89d 4.8.11
diff --git a/alt-patches/mc-4.8.6-alt-extfs-rpm.patch b/alt-patches/mc-4.8.6-alt-extfs-rpm.patch
deleted file mode 100644
index 00fa2bd..0000000
--- a/alt-patches/mc-4.8.6-alt-extfs-rpm.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- mc/src/vfs/extfs/helpers/rpm.old	2012-01-06 23:30:42.000000000 +0200
-+++ mc/src/vfs/extfs/helpers/rpm	2012-05-22 19:51:00.000000000 +0300
-@@ -100,9 +100,9 @@
- "|URL=%{URL}"\
- "|EPOCH=%{EPOCH}"\
- "|LICENSE=%{LICENSE}"\
--"|REQUIRENAME=%{REQUIRENAME}"\
-+"|REQUIRES=%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}"\
- "|OBSOLETES=%{OBSOLETES}"\
--"|PROVIDES=%{PROVIDES}"\
-+"|PROVIDES=%{PROVIDES} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}"\
- ${tag_CONFLICTS}\
- "|PACKAGER=%{PACKAGER}" \
-     "`echo ${rpm_filename}| $SED "${SEDCMD}"`"
-@@ -152,7 +152,7 @@
-     echo "$FILEPREF 0 $DATE INFO/URL"
-     echo "$FILEPREF 0 $DATE INFO/EPOCH"
-     echo "$FILEPREF 0 $DATE INFO/LICENSE"
--    echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
-+    echo "$FILEPREF 0 $DATE INFO/REQUIRES"
-     echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
-     echo "$FILEPREF 0 $DATE INFO/PROVIDES"
-     echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
-@@ -181,7 +181,7 @@
-     mcrpmfs_printOneMetaInfo "INFO/LICENSE" "LICENSE"
- 
- 
--    mcrpmfs_printOneMetaInfo "INFO/REQUIRENAME" "REQUIRENAME"
-+    mcrpmfs_printOneMetaInfo "INFO/REQUIRES" "REQUIRES"
-     mcrpmfs_printOneMetaInfo "INFO/OBSOLETES" "OBSOLETES"
-     mcrpmfs_printOneMetaInfo "INFO/PROVIDES" "PROVIDES"
-     mcrpmfs_printOneMetaInfo "INFO/CONFLICTS" "CONFLICTS"
-@@ -271,8 +271,8 @@
- 	INFO/EPOCH)		mcrpmfs_getOneTag "EPOCH" >"$2"; exit 0;;
- 	INFO/LICENSE)		mcrpmfs_getOneTag "LICENSE" >"$2"; exit 0;;
- 	INFO/RPMVERSION)	mcrpmfs_getRawOneTag "%{RPMVERSION}\n" >"$2"; exit 0;;
--	INFO/REQUIRENAME)	mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;;
--	INFO/PROVIDES)		mcrpmfs_getRawOneTag "[%{PROVIDES}\n]" >"$2"; exit 0;;
-+	INFO/REQUIRES)		mcrpmfs_getRawOneTag "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" >"$2"; exit 0;;
-+	INFO/PROVIDES)		mcrpmfs_getRawOneTag "[%{PROVIDES} %{PROVIDEFLAGS:depflags} %{PROVIDEVERSION}\n]" >"$2"; exit 0;;
- 	INFO/SCRIPTS/PREIN)	mcrpmfs_getRawOneTag "%{RPMTAG_PREIN}\n" >"$2"; exit 0;;
- 	INFO/SCRIPTS/POSTIN)	mcrpmfs_getRawOneTag "%{RPMTAG_POSTIN}\n" >"$2"; exit 0;;
- 	INFO/SCRIPTS/PREUN)	mcrpmfs_getRawOneTag "%{RPMTAG_PREUN}\n" >"$2"; exit 0;;
diff --git a/alt-patches/mc-5c22dc152480607eaca220284330f10a0864a492-man.patch b/alt-patches/mc-5c22dc152480607eaca220284330f10a0864a492-man.patch
deleted file mode 100644
index 111ae45..0000000
--- a/alt-patches/mc-5c22dc152480607eaca220284330f10a0864a492-man.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit 5c22dc152480607eaca220284330f10a0864a492
-Author: Slava Zanko <slavazanko@gmail.com>
-Date:   Tue Apr 9 14:58:59 2013 +0300
-
-    Ticket #3003: man pages should contain charset
-    
-    man pages should contain charset for to display properly in other encodings.
-    
-    Signed-off-by: Slava Zanko <slavazanko@gmail.com>
-
-diff --git a/doc/man/es/mc.1.in b/doc/man/es/mc.1.in
-index 21db9a1..1ef6813 100644
---- a/doc/man/es/mc.1.in
-+++ b/doc/man/es/mc.1.in
-@@ -1,3 +1,4 @@
-+.\" -*- mode: troff; coding: utf8 -*-
- .\" Traducido el 6 de septiembre de 1998 por
- .\"	Francisco Gabriel Aroca Tapia <fgat1@alu.um.es>
- .\"
-diff --git a/doc/man/hu/mc.1.in b/doc/man/hu/mc.1.in
-index 00a8fc5..4221020 100644
---- a/doc/man/hu/mc.1.in
-+++ b/doc/man/hu/mc.1.in
-@@ -1,3 +1,4 @@
-+.\" -*- mode: troff; coding: utf8 -*-
- .\"TOPICS "Tartalomjegyzц╘k"
- .TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
- .\"SKIP_SECTION"
-diff --git a/doc/man/it/mc.1.in b/doc/man/it/mc.1.in
-index 78457ab..2e9e453 100644
---- a/doc/man/it/mc.1.in
-+++ b/doc/man/it/mc.1.in
-@@ -1,3 +1,4 @@
-+.\" -*- mode: troff; coding: utf8 -*-
- .\" Tradotto dal 15 agosto 2002 da
- .\"     Marco Ciampa <ciampix@libero.it>
- .\" Chi vuole contribuire aggiunga il nome qui sotto.
-diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in
-index c2689bd..6690a17 100644
---- a/doc/man/mc.1.in
-+++ b/doc/man/mc.1.in
-@@ -1,3 +1,4 @@
-+.\" -*- mode: troff; coding: utf8 -*-
- .\"TOPICS "Topics:"
- .TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
- .\"SKIP_SECTION"
-diff --git a/doc/man/pl/mc.1.in b/doc/man/pl/mc.1.in
-index 88d346a..b4a1493 100644
---- a/doc/man/pl/mc.1.in
-+++ b/doc/man/pl/mc.1.in
-@@ -1,3 +1,4 @@
-+.\" -*- mode: troff; coding: utf8 -*-
- .\"Przetе┌umaczone przez by Macieja Wojciechowskiego    wojciech@staszic.waw.pl
- .TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
- .\"SKIP_SECTION"
-diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in
-index f69bacb..8a2ccc5 100644
---- a/doc/man/ru/mc.1.in
-+++ b/doc/man/ru/mc.1.in
-@@ -1,3 +1,4 @@
-+.\" -*- mode: troff; coding: utf8 -*-
- .\"TOPICS "п═п╟п╥п╢п╣п╩я▀ п©п╬п╪п╬я┴п╦:"
- .\" TODO: п÷п╣я─п╣п╡п╣я│я┌п╦ я─п╟п╥п╢п╣п╩ EXTernal File System
- .TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
-diff --git a/doc/man/sr/mc.1.in b/doc/man/sr/mc.1.in
-index 3202618..0843dbf 100644
---- a/doc/man/sr/mc.1.in
-+++ b/doc/man/sr/mc.1.in
-@@ -1,3 +1,4 @@
-+.\" -*- mode: troff; coding: utf8 -*-
- .\"TOPICS "п╒п╣п╪п╣:"
- .TH п÷п² 1 "%DATE_OF_MAN_PAGE%" "п÷п² п╡п╣я─п╥п╦я≤п╟ %DISTR_VERSION%" "п⌠п²пё\-п╬п╡ п©п╬п╫п╬я⌡п╫п╦ п╫п╟я─п╣п╢п╫п╦п╨"
- .\"SKIP_SECTION"
diff --git a/mc.spec b/mc.spec
index 54822b3..8a6595e 100644
--- a/mc.spec
+++ b/mc.spec
@@ -1,6 +1,6 @@
 Name: mc
-Version: 4.8.8
-Release: alt3
+Version: 4.8.11
+Release: alt0.M51.1
 
 License: %gpl3plus
 Summary: An user-friendly file manager and visual shell
@@ -35,12 +35,6 @@ Patch102: mc-4.8.8-alt-forceexec.patch
 # http://www.midnight-commander.org/ticket/34
 Patch103: mc-4.8.6-alt-extfs-udar.patch
 
-# http://www.midnight-commander.org/ticket/2812
-Patch104: mc-4.8.6-alt-extfs-rpm.patch
-
-# http://www.midnight-commander.org/ticket/3003
-Patch105: mc-5c22dc152480607eaca220284330f10a0864a492-man.patch
-
 BuildRequires(pre): rpm-build-licenses
 
 Conflicts: %name-data
@@ -51,6 +45,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
@@ -91,11 +87,9 @@ needed for working all components (some vfs for example)
 %patch3 -p1
 
 # Misc
-%patch101 -p1
+#patch101 -p1
 %patch102 -p1
 %patch103 -p1
-%patch104 -p1
-%patch105 -p1
 
 cat <<EOF > version.h
 #ifndef MC_CURRENT_VERSION
@@ -121,7 +115,7 @@ subst 's|@@VERSION@@|%version-%release|' version.h
 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
@@ -182,6 +176,13 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png
 %files full
 
 %changelog
+* Sat Dec 14 2013 Sergey Y. Afonin <asy@altlinux.ru> 4.8.11-alt0.M51.1
+- Branch 5.1 backport
+
+* Wed Dec 04 2013 Sergey Y. Afonin <asy@altlinux.ru> 4.8.11-alt1
+- 4.8.11
+- diabled savannah-edit-homekey.patch (many changes in mcedit)
+
 * Tue Apr 09 2013 Sergey Y. Afonin <asy@altlinux.ru> 4.8.8-alt3
 - applied patch for mc ticket #3003 (ALT #28817)
 
@@ -233,19 +234,35 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png
 - removed mc-4.7.5.3-alt-extf*s-udar.patch
   http://www.midnight-commander.org/ticket/34
 
+* Wed Jan 11 2012 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.6-alt0.M51.1
+- Branch 5.1 backport
+
 * Sat Jan 07 2012 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.6-alt1
 - 4.7.5.6
 
+* Sat Oct 22 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.5-alt0.M51.3
+- Branch 5.1 backport
+
 * Sat Oct 22 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.5-alt3
 - applied fix from #2635
 
+* Thu Oct 20 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.5-alt0.M51.2
+- Branch 5.1 backport
+
 * Thu Oct 20 2011 Sergey Y. Afonin <asy@altlinux.ru> 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 <asy@altlinux.ru> 4.7.5.5-alt0.M51.1
+- Branch 5.1 backport
+
 * Wed Oct 19 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.5-alt1
 - 4.7.5.5
 - disabled rollback for #81
 
+* Tue Aug 23 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.3-alt0.M51.3
+- Branch 5.1 backport
+- disabled separated alias definition for zsh
+
 * Tue Aug 23 2011 Sergey Y. Afonin <asy@altlinux.ru> 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)
@@ -254,6 +271,9 @@ install -pD -m644 %SOURCE5 %buildroot%_niconsdir/%name.png
 * Tue Aug 09 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.3-alt2
 - moved mc.sh from bashrc.d to profile.d (ALT #25703)
 
+* Mon Aug 08 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.3-alt0.M51.1
+- Branch 5.1 backport
+
 * Mon Aug 08 2011 Sergey Y. Afonin <asy@altlinux.ru> 4.7.5.3-alt1
 - 4.7.5.3
 
@@ -272,6 +292,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 <asy@altlinux.ru> 4.7.0.10-alt0.M51.5
+- Branch 5.1 update
+- added "mc47" to "Obsoletes"
+
 * Tue Dec 21 2010 Sergey Y. Afonin <asy@altlinux.ru> 4.7.0.10-alt5
 - fixed processing of ";1" in some ISO images (closes: #12299)
 
@@ -300,6 +324,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 <radik@altlinux.org> 4.7.0.2-alt0.M51.2
+- Build for branch 5.1
+
 * Thu Feb 25 2010 Andrey Rahmatullin <wrar@altlinux.ru> 4.7.0.2-alt2
 - 4.7.0.2-37-ge0030fd (closes: #22979)
 

S:	4.8.30-alt3
5.1:	4.8.11-alt0.M51.1
4.1:	4.6.2-alt7.pre1
4.0:	4.6.1r-alt9
3.0:	4.6.1r-alt3