packages: mc/mc.spec, mc/mc-mhl.patch (REMOVED) - mcserv is back

[arekm]

Author: arekm                        Date: Sun Sep  6 16:26:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mcserv is back

---- Files affected:
packages/mc:
   mc.spec (1.281 -> 1.282) , mc-mhl.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/mc/mc.spec
diff -u packages/mc/mc.spec:1.281 packages/mc/mc.spec:1.282
--- packages/mc/mc.spec:1.281	Sun Sep  6 18:17:23 2009
+++ packages/mc/mc.spec	Sun Sep  6 18:26:50 2009
@@ -6,7 +6,6 @@
 # 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
 #
@@ -41,7 +40,6 @@
 Patch4:		%{name}-home_etc2.patch
 Patch5:		%{name}-pl.patch
 Patch6:		%{name}-no-ws-visible.patch
-Patch7:		%{name}-mhl.patch
 Patch8:		%{name}-mc.ext.patch
 Patch10:	%{name}-localenames.patch
 Patch11:	%{name}-noperl-vfs.patch
@@ -235,7 +233,6 @@
 # doesn't apply
 #%patch5 -p1
 %patch6 -p1
-%patch7 -p1
 # doesn't apply
 #%patch8 -p1
 # doesn't apply
@@ -286,7 +283,8 @@
 	--with%{!?with_ext2undel:out}-ext2undel \
 	--with%{!?with_x:out}-x \
 	--with-vfs \
-	%{?with_mcfs:--enable-vfs-mcfs} \
+	--enable-vfs-mcfs \
+	--enable-mcserver \
 	%{?with_samba:--with-samba} \
 	--with-configdir=/etc/samba \
 	--with-codepagedir=/etc/samba/codepages \
@@ -416,7 +414,6 @@
 %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/*
@@ -428,7 +425,6 @@
 %lang(pl) %{_mandir}/pl/man8/mcserv.8*
 %lang(sr) %{_mandir}/sr/man8/mcserv.8*
 %attr(755,root,root) %{_sbindir}/mcserv
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -436,6 +432,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.282  2009/09/06 16:26:50  arekm
+- mcserv is back
+
 Revision 1.281  2009/09/06 16:17:23  arekm
 - drop obsolete patches
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mc/mc.spec?r1=1.281&r2=1.282&f=u