Fri Jul 31 18:40:04 UTC 2009

Author: jnovy

Update of /cvs/pkgs/rpms/mc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20518

Modified Files:
	.cvsignore mc-exit.patch mc-prompt.patch mc.spec sources 
Removed Files:
	mc-4.6.2-utf8.patch mc-64bit.patch 
	mc-cedit-configurable-highlight.patch mc-cedit.patch 
	mc-delcheck.patch mc-edit-segv.patch mc-etcmc.patch 
	mc-extensions.patch mc-hintchk.patch mc-lzma.patch 
	mc-ministatus.patch mc-newlinedir.patch mc-oldrpmtags.patch 
	mc-refresh.patch mc-shellcwd.patch mc-showfree.patch 
	mc-spaceprompt.patch mc-userhost.patch 
Log Message:
* Fri Jul 31 2009 Jindrich Novy <jnovy at redhat.com> 4.6.99-0.20090731git
- update to latest GIT mc
- forwardport prompt fix and exit patch, keep IPv6 patch and drop the others



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38

--- .cvsignore	27 May 2009 05:49:12 -0000	1.37
+++ .cvsignore	31 Jul 2009 18:40:03 -0000	1.38
@@ -1 +1 @@
-mc-4.6.2.tar.gz
+mc-4.6.99-20090731git.tar.bz2

mc-exit.patch:
 command.c |    5 +++++
 1 file changed, 5 insertions(+)

Index: mc-exit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc-exit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mc-exit.patch	15 Aug 2006 11:00:45 -0000	1.1
+++ mc-exit.patch	31 Jul 2009 18:40:04 -0000	1.2
@@ -1,14 +1,15 @@
---- mc-2006-08-12-18/src/command.c.exit	2005-06-07 16:16:19.000000000 +0200
-+++ mc-2006-08-12-18/src/command.c	2006-08-15 12:48:12.000000000 +0200
-@@ -214,6 +214,11 @@
+diff -up mc-4.6.99/src/command.c.exit mc-4.6.99/src/command.c
+--- mc-4.6.99/src/command.c.exit	2009-07-31 19:27:10.000000000 +0200
++++ mc-4.6.99/src/command.c	2009-07-31 20:08:01.000000000 +0200
+@@ -224,6 +224,11 @@ enter (WInput *cmdline)
  	size_t i, j, cmd_len;
  
  	if (!vfs_current_is_local ()) {
-+		if (strcmp (cmd, "exit") == 0) {
-+			quiet_quit_cmd ();
-+			return MSG_HANDLED;
-+		}
++	    if (strcmp (cmd, "exit") == 0) {
++		quiet_quit_cmd ();
++		return MSG_HANDLED;
++	    }
 +
- 	    message (1, MSG_ERROR,
+ 	    message (D_ERROR, MSG_ERROR,
  		     _
  		     (" Cannot execute commands on non-local filesystems"));

mc-prompt.patch:
 execute.c  |    2 ++
 main.c     |    2 +-
 subshell.c |   39 ++++++++++++++++++++++++++++++++-------
 subshell.h |    3 +++
 4 files changed, 38 insertions(+), 8 deletions(-)

Index: mc-prompt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc-prompt.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mc-prompt.patch	20 Jun 2007 14:39:18 -0000	1.2
+++ mc-prompt.patch	31 Jul 2009 18:40:04 -0000	1.3
@@ -1,6 +1,7 @@
---- mc-2007-06-04-22/src/execute.c.prompt	2005-09-28 23:28:06.000000000 +0200
-+++ mc-2007-06-04-22/src/execute.c	2007-06-20 14:07:17.000000000 +0200
-@@ -140,6 +140,8 @@ do_execute (const char *shell, const cha
+diff -up mc-4.6.99/src/execute.c.prompt mc-4.6.99/src/execute.c
+--- mc-4.6.99/src/execute.c.prompt	2009-07-31 14:57:10.000000000 +0200
++++ mc-4.6.99/src/execute.c	2009-07-31 14:58:21.000000000 +0200
+@@ -146,6 +146,8 @@ do_execute (const char *shell, const cha
  	    printf ("\r\n");
  	    fflush (stdout);
  	}
@@ -9,9 +10,10 @@
  	if (console_flag) {
  	    if (output_lines && keybar_visible) {
  		putchar ('\n');
---- mc-2007-06-04-22/src/main.c.prompt	2007-06-20 14:07:17.000000000 +0200
-+++ mc-2007-06-04-22/src/main.c	2007-06-20 14:07:17.000000000 +0200
-@@ -454,7 +454,7 @@ void
+diff -up mc-4.6.99/src/main.c.prompt mc-4.6.99/src/main.c
+--- mc-4.6.99/src/main.c.prompt	2009-07-31 14:57:10.000000000 +0200
++++ mc-4.6.99/src/main.c	2009-07-31 14:58:21.000000000 +0200
+@@ -459,7 +459,7 @@ void
  do_update_prompt (void)
  {
      if (update_prompt) {
@@ -20,21 +22,10 @@
  	fflush (stdout);
  	update_prompt = 0;
      }
---- mc-2007-06-04-22/src/subshell.h.prompt	2004-12-03 20:17:47.000000000 +0100
-+++ mc-2007-06-04-22/src/subshell.h	2007-06-20 14:07:17.000000000 +0200
-@@ -20,6 +20,9 @@ extern enum subshell_state_enum subshell
- /* Holds the latest prompt captured from the subshell */
- extern char *subshell_prompt;
- 
-+/* Holds the latest prompt captured from the subshell with terminal codes */
-+extern char *original_subshell_prompt;
-+
- /* For the `how' argument to various functions */
- enum {QUIETLY, VISIBLY};
- 
---- mc-2007-06-04-22/src/subshell.c.prompt	2007-06-20 14:07:17.000000000 +0200
-+++ mc-2007-06-04-22/src/subshell.c	2007-06-20 14:24:14.000000000 +0200
-@@ -107,6 +107,9 @@ enum subshell_state_enum subshell_state;
+diff -up mc-4.6.99/src/subshell.c.prompt mc-4.6.99/src/subshell.c
+--- mc-4.6.99/src/subshell.c.prompt	2009-07-31 14:57:11.000000000 +0200
++++ mc-4.6.99/src/subshell.c	2009-07-31 15:02:35.000000000 +0200
+@@ -114,6 +114,9 @@ enum subshell_state_enum subshell_state;
  /* Holds the latest prompt captured from the subshell */
  char *subshell_prompt = NULL;
  
@@ -44,7 +35,7 @@
  /* Initial length of the buffer for the subshell's prompt */
  #define INITIAL_PROMPT_SIZE 10
  
-@@ -148,6 +151,7 @@ static struct termios raw_mode;
+@@ -160,6 +163,7 @@ static struct termios raw_mode;
  /* This counter indicates how many characters of prompt we have read */
  /* FIXME: try to figure out why this had to become global */
  static int prompt_pos;
@@ -52,7 +43,7 @@
  
  
  /*
-@@ -567,6 +571,7 @@ int invoke_subshell (const char *command
+@@ -598,6 +602,7 @@ int invoke_subshell (const char *command
  	init_subshell ();
  
      prompt_pos = 0;
@@ -60,7 +51,7 @@
  
      return quit;
  }
-@@ -576,6 +581,7 @@ int
+@@ -607,6 +612,7 @@ int
  read_subshell_prompt (void)
  {
      static int prompt_size = INITIAL_PROMPT_SIZE;
@@ -68,7 +59,7 @@
      int bytes = 0, i, rc = 0;
      struct timeval timeleft = { 0, 0 };
  
-@@ -586,7 +592,10 @@ read_subshell_prompt (void)
+@@ -617,7 +623,10 @@ read_subshell_prompt (void)
      if (subshell_prompt == NULL) {	/* First time through */
  	subshell_prompt = g_malloc (prompt_size);
  	*subshell_prompt = '\0';
@@ -79,7 +70,7 @@
      }
  
      while (subshell_alive
-@@ -607,20 +616,27 @@ read_subshell_prompt (void)
+@@ -638,20 +647,27 @@ read_subshell_prompt (void)
  
  	/* Extract the prompt from the shell output */
  
@@ -111,16 +102,15 @@
      }
      if (rc == 0 && bytes == 0)
  	return FALSE;
-@@ -743,6 +759,8 @@ subshell_name_quote (const char *s)
- void
- do_subshell_chdir (const char *directory, int do_update, int reset_prompt)
- {
+@@ -792,6 +808,7 @@ do_subshell_chdir (const char *directory
+     char *pcwd;
+     char *temp;
+     char *translate;
 +    static char *old_subshell_prompt = NULL;
-+
-     if (!
- 	(subshell_state == INACTIVE
- 	 && strcmp (subshell_cwd, current_panel->cwd))) {
-@@ -750,8 +768,14 @@ do_subshell_chdir (const char *directory
+     
+     pcwd = vfs_translate_path_n (current_panel->cwd);
+     
+@@ -802,8 +819,14 @@ do_subshell_chdir (const char *directory
  	 * the main program.  Please note that in the code after this
  	 * if, the cd command that is sent will make the subshell
  	 * repaint the prompt, so we don't have to paint it. */
@@ -129,15 +119,15 @@
 +	if (do_update) {
 +	    if (old_subshell_prompt == NULL
 +		|| strcmp (old_subshell_prompt, original_subshell_prompt)) {
-+		g_free (old_subshell_prompt);
-+		old_subshell_prompt = g_strdup (original_subshell_prompt);
-+		do_update_prompt ();
++		    g_free (old_subshell_prompt);
++		    old_subshell_prompt = g_strdup (original_subshell_prompt);
++		    do_update_prompt ();
 +	    }
 +	}
+         g_free (pcwd);
  	return;
      }
- 
-@@ -802,8 +826,10 @@ do_subshell_chdir (const char *directory
+@@ -861,8 +884,10 @@ do_subshell_chdir (const char *directory
  	}
      }
  
@@ -147,5 +137,18 @@
 +	original_prompt_pos = 0;
 +    }
      update_prompt = FALSE;
-     /* Make sure that MC never stores the CWD in a silly format */
-     /* like /usr////lib/../bin, or the strcmp() above will fail */
+     
+     g_free (pcwd);
+diff -up mc-4.6.99/src/subshell.h.prompt mc-4.6.99/src/subshell.h
+--- mc-4.6.99/src/subshell.h.prompt	2009-07-31 14:57:10.000000000 +0200
++++ mc-4.6.99/src/subshell.h	2009-07-31 14:58:21.000000000 +0200
+@@ -25,6 +25,9 @@ extern enum subshell_state_enum subshell
+ /* Holds the latest prompt captured from the subshell */
+ extern char *subshell_prompt;
+ 
++/* Holds the latest prompt captured from the subshell with terminal codes */
++extern char *original_subshell_prompt;
++
+ /* For the `how' argument to various functions */
+ enum {QUIETLY, VISIBLY};
+ 


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/mc.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- mc.spec	25 Jul 2009 11:54:02 -0000	1.143
+++ mc.spec	31 Jul 2009 18:40:04 -0000	1.144
@@ -1,38 +1,23 @@
+%define alphatag 20090731git
+
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
-Version:	4.6.2
-Release:	12%{?dist}
+Version:	4.6.99
+Release:	0.%{alphatag}%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
-# tarball from http://www.midnight-commander.org/downloads/3
-Source0:	mc-%{version}.tar.gz
+# tarball created from git clone git://midnight-commander.org/git/mc.git
+Source0:	mc-%{version}-%{alphatag}.tar.bz2
 URL:		http://www.midnight-commander.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	glib2-devel e2fsprogs-devel slang-devel
-BuildRequires:	gettext cvs automake autoconf
-Requires:	dev >= 0:3.3-3
+BuildRequires:	gettext cvs automake autoconf libtool
+Requires:	dev >= 3.3-3
 
-# UTF-8 patch from http://www.midnight-commander.org/downloads/4
-Patch0:		mc-4.6.2-utf8.patch
-Patch1:		mc-extensions.patch
-Patch2:		mc-userhost.patch
-Patch3:		mc-64bit.patch
-Patch6:		mc-showfree.patch
-Patch7:		mc-cedit.patch
-Patch8:		mc-delcheck.patch
-Patch9:		mc-etcmc.patch
-Patch10:	mc-exit.patch
-Patch12:	mc-ipv6.patch
-Patch13:	mc-newlinedir.patch
-Patch15:	mc-prompt.patch
-Patch16:	mc-refresh.patch
-Patch18:	mc-lzma.patch
-Patch19:	mc-hintchk.patch
-Patch21:	mc-oldrpmtags.patch
-Patch22:	mc-shellcwd.patch
-Patch23:	mc-cedit-configurable-highlight.patch
-Patch24:	mc-edit-segv.patch
+Patch1:		mc-ipv6.patch
+Patch2:		mc-prompt.patch
+Patch3:		mc-exit.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -43,88 +28,13 @@ specific files.
 
 %prep
 %setup -q
-%patch0 -p1 -b .utf8
-%patch1 -p1 -b .extensions
-%patch2 -p1 -b .userhost
-%patch3 -p1 -b .64bit
-%patch6 -p1 -b .showfree
-%patch7 -p1 -b .cedit
-%patch8 -p1 -b .delcheck
-%patch9 -p1 -b .etcmc
-%patch10 -p1 -b .exit
-%patch12 -p1 -b .ipv6
-%patch13 -p1 -b .newlinedir
-%patch15 -p1 -b .prompt
-%patch16 -p1 -b .refresh
-%patch18 -p1 -b .lzmavfs
-%patch19 -p1 -b .hintchk
-%patch21 -p1 -b .oldrpmtags
-%patch22 -p1 -b .shellcwd
-%patch23 -p1 -b .cedit-configurable-highlight
-%patch24 -p1 -b .edit-segv
-
-# convert files in /lib to UTF-8
-pushd 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
-popd
-
-
-# convert man pages in /doc to UTF-8
-pushd doc
-
-pushd 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
-popd
-
-pushd 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
-popd
-
-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
-
-popd
+%patch1 -p1 -b .ipv6
+%patch2 -p1 -b .prompt
+%patch3 -p1 -b .exit
 
 %build
 ./autogen.sh
-export CFLAGS="-DUTF8=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS -fgnu89-inline"
+export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
 %configure --with-screen=slang \
 	     --enable-charset \
 	     --with-samba \
@@ -134,33 +44,13 @@ make %{?_smp_mflags}
 
 %install 
 rm -rf $RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/mc/syntax
 
 make install DESTDIR="$RPM_BUILD_ROOT"
 
-install lib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-
-# move configuration files to /etc/mc to make it FHS compliant (#2188)
-mv -f $RPM_BUILD_ROOT%{_datadir}/mc/{cedit.menu,edit.indent.rc,edit.spell.rc,\
-mc.ext,mc.lib,mc.menu,mc.charsets} $RPM_BUILD_ROOT%{_sysconfdir}/mc
-mv -f $RPM_BUILD_ROOT%{_datadir}/mc/extfs/*.ini $RPM_BUILD_ROOT%{_sysconfdir}/mc/extfs
-mv -f $RPM_BUILD_ROOT%{_datadir}/mc/syntax/Syntax $RPM_BUILD_ROOT%{_sysconfdir}/mc/syntax
-
-# install man pages in various languages
-for l in es hu it pl ru sr; do
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/${l}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/${l}/man1
-install -m 644 doc/${l}/mc.1 $RPM_BUILD_ROOT%{_mandir}/${l}/man1
-done
-
-for I in /etc/pam.d/mcserv \
-	/etc/rc.d/init.d/mcserv \
-	/etc/mc.global; do
-	rm -rf ${RPM_BUILD_ROOT}${I}
-done
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install contrib/{mc.sh,mc.csh} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+#mkdir -p $RPM_BUILD_ROOT%{_datadir}/mc/bin
+#mv $RPM_BUILD_ROOT%{_libexecdir}/mc/{mc.sh,mc.csh,mc-wrapper.sh,mc-wrapper.csh} $RPM_BUILD_ROOT%{_datadir}/mc/bin
 
 %find_lang %{name}
 
@@ -169,14 +59,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-
-%doc FAQ COPYING NEWS README
+%doc doc/FAQ doc/COPYING doc/NEWS doc/README
 %{_bindir}/mc
 %{_bindir}/mcedit
 %{_bindir}/mcmfmt
 %{_bindir}/mcview
 %{_datadir}/mc/*
 %attr(4711, vcsa, root) %{_libexecdir}/mc/cons.saver
+%{_libexecdir}/mc/mc*
 %{_mandir}/man1/*
 %lang(es) %{_mandir}/es/man1/mc.1*
 %lang(hu) %{_mandir}/hu/man1/mc.1*
@@ -185,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ru) %{_mandir}/ru/man1/mc.1*
 %lang(sr) %{_mandir}/sr/man1/mc.1*
 %{_sysconfdir}/profile.d/*
-%config %{_sysconfdir}/mc/syntax/Syntax
+%config %{_sysconfdir}/mc/Syntax
 %config %{_sysconfdir}/mc/mc.charsets
 %config %{_sysconfdir}/mc/mc.lib
 %config(noreplace) %{_sysconfdir}/mc/*edit*
@@ -195,11 +85,14 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/mc/extfs/sfs.ini
 %dir %{_datadir}/mc
 %dir %{_sysconfdir}/mc
-%dir %{_sysconfdir}/mc/syntax
 %dir %{_sysconfdir}/mc/extfs
 %dir %{_libexecdir}/mc
 
 %changelog
+* Fri Jul 31 2009 Jindrich Novy <jnovy at redhat.com> 4.6.99-0.20090731git
+- update to latest GIT mc
+- forwardport prompt fix and exit patch, keep IPv6 patch and drop the others
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.6.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mc/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- sources	27 May 2009 05:49:13 -0000	1.45
+++ sources	31 Jul 2009 18:40:04 -0000	1.46
@@ -1 +1 @@
-ec92966f4d0c8b50c344fe901859ae2a  mc-4.6.2.tar.gz
+9f705ec40a2551121ddf0f517c13d96b  mc-4.6.99-20090731git.tar.bz2


--- mc-4.6.2-utf8.patch DELETED ---


--- mc-64bit.patch DELETED ---


--- mc-cedit-configurable-highlight.patch DELETED ---


--- mc-cedit.patch DELETED ---


--- mc-delcheck.patch DELETED ---


--- mc-edit-segv.patch DELETED ---


--- mc-etcmc.patch DELETED ---


--- mc-extensions.patch DELETED ---


--- mc-hintchk.patch DELETED ---


--- mc-lzma.patch DELETED ---


--- mc-ministatus.patch DELETED ---


--- mc-newlinedir.patch DELETED ---


--- mc-oldrpmtags.patch DELETED ---


--- mc-refresh.patch DELETED ---


--- mc-shellcwd.patch DELETED ---


--- mc-showfree.patch DELETED ---


--- mc-spaceprompt.patch DELETED ---


--- mc-userhost.patch DELETED ---


