packages: mc/mc-nolibs.patch, mc/mc.spec - update patches

[arekm]

Author: arekm                        Date: Sun Sep  6 16:47:17 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update patches

---- Files affected:
packages/mc:
   mc-nolibs.patch (1.3 -> 1.4) , mc.spec (1.284 -> 1.285) 

---- Diffs:

================================================================
Index: packages/mc/mc-nolibs.patch
diff -u packages/mc/mc-nolibs.patch:1.3 packages/mc/mc-nolibs.patch:1.4
--- packages/mc/mc-nolibs.patch:1.3	Tue Feb 28 17:52:01 2006
+++ packages/mc/mc-nolibs.patch	Sun Sep  6 18:47:12 2009
@@ -1,24 +1,11 @@
-diff -urN mc-2006-02-24-22.org/acinclude.m4 mc-2006-02-24-22/acinclude.m4
---- mc-2006-02-24-22.org/acinclude.m4	2006-02-28 17:39:56.356182000 +0100
-+++ mc-2006-02-24-22/acinclude.m4	2006-02-28 17:42:26.541568000 +0100
-@@ -146,7 +146,7 @@
-     dnl FIXME: network checks should probably be in their own macro.
-     AC_SEARCH_LIBS(socket, [xnet bsd socket inet], [have_socket=yes])
-     if test x$have_socket = xyes; then
--      AC_SEARCH_LIBS(gethostbyname, [bsd socket inet netinet])
-+      AC_SEARCH_LIBS(gethostbyname, [bsd socket inet netinet nsl])
-       AC_CHECK_MEMBERS([struct linger.l_linger], , , [
+--- mc-4.7.0-pre2/m4.include/mc-vfs.m4~	2009-08-04 23:36:33.000000000 +0200
++++ mc-4.7.0-pre2/m4.include/mc-vfs.m4	2009-09-06 18:44:17.955791270 +0200
+@@ -40,7 +40,7 @@
+ 	dnl FIXME: network checks should probably be in their own macro.
+ 	AC_SEARCH_LIBS(socket, [xnet bsd socket inet], [have_socket=yes])
+ 	if test x"$have_socket" = xyes; then
+-	    AC_SEARCH_LIBS(gethostbyname, [bsd socket inet netinet])
++	    AC_SEARCH_LIBS(gethostbyname, [bsd socket inet netinet nsl])
+ 	    AC_CHECK_MEMBERS([struct linger.l_linger], , , [
  #include <sys/types.h>
  #include <sys/socket.h>
-diff -urN mc-2006-02-24-22.org/configure.ac mc-2006-02-24-22/configure.ac
---- mc-2006-02-24-22.org/configure.ac	2006-02-24 23:36:32.000000000 +0100
-+++ mc-2006-02-24-22/configure.ac	2006-02-28 17:43:17.424748000 +0100
-@@ -304,8 +304,6 @@
- dnl
- dnl Network related functions
- dnl
--
--AC_SEARCH_LIBS([socket], [socket])
- AC_SEARCH_LIBS([gethostbyname], [nsl])
- 
- dnl

================================================================
Index: packages/mc/mc.spec
diff -u packages/mc/mc.spec:1.284 packages/mc/mc.spec:1.285
--- packages/mc/mc.spec:1.284	Sun Sep  6 18:41:48 2009
+++ packages/mc/mc.spec	Sun Sep  6 18:47:12 2009
@@ -46,7 +46,6 @@
 Patch12:	%{name}-pld-developerfriendly.patch
 Patch16:	%{name}-refresh.patch
 Patch17:	%{name}-nolibs.patch
-Patch21:	%{name}-userhost.patch
 Patch24:	%{name}-find_options.patch
 Patch25:	%{name}-verilog-syntax.patch
 URL:		http://www.midnight-commander.org/
@@ -237,10 +236,7 @@
 # doesn't apply
 #%patch12 -p1
 %patch16 -p1
-# doesn't apply
-#%patch17 -p1
-# doesn't apply
-#%patch21 -p1
+%patch17 -p1
 %if "%{pld_release}" == "ti"
 %patch24 -p1
 %endif
@@ -428,6 +424,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.285  2009/09/06 16:47:12  arekm
+- update patches
+
 Revision 1.284  2009/09/06 16:41:48  arekm
 - localenames obsolete (fixed upstream after pre2)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mc/mc-nolibs.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mc/mc.spec?r1=1.284&r2=1.285&f=u