rpms/mc/F-12 .cvsignore, 1.41, 1.42 mc-extensions.patch, 1.17, 1.18 mc.spec, 1.149, 1.150 sources, 1.49, 1.50 mc-exit.patch, 1.2, NONE mc-rpmvfs.patch, 1.1, NONE

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/mc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12976

Modified Files:
	.cvsignore mc-extensions.patch mc.spec sources 
Removed Files:
	mc-exit.patch mc-rpmvfs.patch 
Log Message:
* Tue Dec 22 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.6.pre4.20091221git
- provide yum-repo.syntax (#549014)
- avoid occasional crash while reading panels (#548987)
- avoid crash while getting user ID (#548311)
- enable mcvfs, disable rpath



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	10 Dec 2009 19:53:30 -0000	1.41
+++ .cvsignore	22 Dec 2009 10:41:00 -0000	1.42
@@ -1 +1 @@
-mc-4.7.0-pre4.tar.bz2
+mc-4.7.0-pre4-20091221git.tar.bz2

mc-extensions.patch:
 configure.ac   |    2 +-
 misc/mc.ext.in |   51 ++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 18 deletions(-)

Index: mc-extensions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/mc-extensions.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mc-extensions.patch	10 Dec 2009 19:53:30 -0000	1.17
+++ mc-extensions.patch	22 Dec 2009 10:41:00 -0000	1.18
@@ -87,16 +87,6 @@ diff -up mc-4.7.0-pre4/misc/mc.ext.in.ex
  
  
  ### Video ###
-@@ -440,6 +452,9 @@ regex/\.([aA][sS][fFxX])$
- regex/\.([dD][iI][vV][xX])$
- 	Include=video
- 
-+regex/\.([mM][kK][vV])$
-+	Include=video
-+
- regex/\.([mM][oO][vV]|[qQ][tT])$
- 	Include=video
- 
 @@ -471,12 +486,12 @@ include/video
  
  # Postscript


Index: mc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/mc.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- mc.spec	10 Dec 2009 19:53:30 -0000	1.149
+++ mc.spec	22 Dec 2009 10:41:01 -0000	1.150
@@ -1,19 +1,19 @@
 Summary:	User-friendly text console file manager and visual shell
 Name:		mc
 Version:	4.7.0
-Release:	0.5.pre4%{?dist}
+Release:	0.6.pre4.20091221git%{?dist}
 Epoch:		1
 License:	GPLv2
 Group:		System Environment/Shells
 # tarball created from git clone git://midnight-commander.org/git/mc.git
-Source0:	mc-%{version}-pre4.tar.bz2
+Source0:	mc-%{version}-pre4-20091221git.tar.bz2
 URL:		http://www.midnight-commander.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	gettext cvs automake autoconf libtool
 BuildRequires:	glib2-devel e2fsprogs-devel slang-devel gpm-devel
 Requires:	dev >= 3.3-3
 
 Patch1:		mc-extensions.patch
-Patch2:		mc-rpmvfs.patch
 
 %description
 Midnight Commander is a visual shell much like a file manager, only
@@ -23,17 +23,19 @@ ability to FTP, view tar and zip files, 
 specific files.
 
 %prep
-%setup -q -n mc-%{version}-pre4
+%setup -q
 %patch1 -p1 -b .extensions
-%patch2 -p1 -b .rpmvfs
 
 %build
 export CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $RPM_OPT_FLAGS"
-%configure --with-screen=slang \
-	     --enable-charset \
-	     --with-samba \
-	     --without-x \
-	     --with-gpm-mouse
+./autogen.sh
+%configure	--with-screen=slang \
+		--enable-charset \
+		--with-samba \
+		--without-x \
+		--with-gpm-mouse \
+		--disable-rpath \
+		--with-mcfs
 make %{?_smp_mflags}
 
 %install 
@@ -82,6 +84,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/mc
 
 %changelog
+* Tue Dec 22 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.6.pre4.20091221git
+- provide yum-repo.syntax (#549014)
+- avoid occasional crash while reading panels (#548987)
+- avoid crash while getting user ID (#548311)
+- enable mcvfs, disable rpath
+
 * Thu Dec 10 2009 Jindrich Novy <jnovy at redhat.com> 4.7.0-0.5.pre4
 - update to pre4:
   - fixes color parsing (#545805)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mc/F-12/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sources	10 Dec 2009 19:53:30 -0000	1.49
+++ sources	22 Dec 2009 10:41:01 -0000	1.50
@@ -1 +1 @@
-7bdc0ac4fe57c19a6bf2fd3e8894a073  mc-4.7.0-pre4.tar.bz2
+c03992e430a41d3e73faa6360979cadf  mc-4.7.0-pre4-20091221git.tar.bz2


--- mc-exit.patch DELETED ---


--- mc-rpmvfs.patch DELETED ---