rpms/fetchmail/devel fetchmail-6.3.3-resolv.patch, 1.1, 1.2 fetchmail.spec, 1.42, 1.43

[fedora-cvs-commits at redhat.com]

Author: mitr

Update of /cvs/dist/rpms/fetchmail/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1080

Modified Files:
	fetchmail-6.3.3-resolv.patch fetchmail.spec 
Log Message:
* Sat Apr  1 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.3-3
- Fix fetchmail-6.3.3-resolv.patch


fetchmail-6.3.3-resolv.patch:
 configure.ac |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 deletions(-)

Index: fetchmail-6.3.3-resolv.patch
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail-6.3.3-resolv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetchmail-6.3.3-resolv.patch	31 Mar 2006 20:46:42 -0000	1.1
+++ fetchmail-6.3.3-resolv.patch	1 Apr 2006 21:14:33 -0000	1.2
@@ -1,6 +1,5 @@
-diff --exclude '*~' --exclude '*.o' -urN fetchmail/configure.ac fetchmail-6.3.3/configure.ac
---- fetchmail/configure.ac	2006-03-29 12:30:05.000000000 +0200
-+++ fetchmail-6.3.3/configure.ac	2006-03-31 19:29:12.000000000 +0200
+--- fetchmail-6.3.3/configure.ac.resolv	2006-03-29 12:30:05.000000000 +0200
++++ fetchmail-6.3.3/configure.ac	2006-04-01 23:08:49.000000000 +0200
 @@ -137,7 +137,7 @@
  AC_SUBST(EXTRAOBJ)
  
@@ -10,7 +9,7 @@
    atexit inet_aton strftime setrlimit socketpair sigprocmask dnl
    sigaction strdup setlocale)
  
-@@ -147,10 +147,32 @@
+@@ -147,10 +147,33 @@
  # and breaks gethostbyname(2).  It's better to use the bind stuff in the C
  # library.  So don't add -lresolv to the link list unless it's necessary
  # (It will be necessary when using GNU libc6).
@@ -18,7 +17,7 @@
 -    AC_MSG_RESULT(using libc's resolver functions),
 -    AC_CHECK_LIB(resolv,res_search, 
 -	[AC_DEFINE(HAVE_RES_SEARCH) AC_MSG_RESULT(found resolver functions in libresolv); LIBS="$LIBS -lresolv"], AC_MSG_RESULT(no resolver calls found)))
-+old_libs=$LIBS
++old_LIBS=$LIBS
 +for lib in '' -lresolv; do
 +    if test -z "$lib"; then
 +       AC_MSG_CHECKING([for res_search in libc])
@@ -43,6 +42,7 @@
 +     AC_DEFINE(HAVE_RES_SEARCH, [1],
 +	       [Define to 1 if you have the `res_search' function.])
 +     break], [AC_MSG_RESULT([not found])])
++    LIBS=$old_LIBS
 +done
  
  dnl Check for libcrypt -- it may live in libc or libcrypt, as on IRIX


Index: fetchmail.spec
===================================================================
RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- fetchmail.spec	31 Mar 2006 20:46:42 -0000	1.42
+++ fetchmail.spec	1 Apr 2006 21:14:33 -0000	1.43
@@ -4,7 +4,7 @@
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 6.3.3
-Release: 2
+Release: 3
 Requires: smtpdaemon
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
@@ -90,6 +90,9 @@
 %endif
 
 %changelog
+* Sat Apr  1 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.3-3
+- Fix fetchmail-6.3.3-resolv.patch
+
 * Fri Mar 31 2006 Miloslav Trmac <mitr at redhat.com> - 6.3.3-2
 - Fix some type mismatches on 64-bit architectures
 - Fix checking for res_* on architectures with newer glibc ABI