From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 8 Apr 2007 19:57:10 +0000 (+0000)
Subject: - restored missing hunk
X-Git-Tag: auto/th/rpm-build-macros-1_382-1~7
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=3090bc6891c4bc904ed5407bb23d41742e04a0dc;ds=sidebyside

- restored missing hunk

Changed files:
    rpm-no-neon.patch -> 1.10
---

diff --git a/rpm-no-neon.patch b/rpm-no-neon.patch
index 844f698..647c3fc 100644
--- a/rpm-no-neon.patch
+++ b/rpm-no-neon.patch
@@ -1,3 +1,39 @@
+--- rpm-4.4.7.org/configure.ac	2006-10-17 22:12:03.110624000 +0200
++++ rpm-4.4.7/configure.ac	2006-10-17 22:12:43.117124500 +0200
+@@ -530,33 +530,6 @@
+ AC_SUBST(WITH_BEECRYPT_INCLUDE)
+ AC_SUBST(WITH_BEECRYPT_LIB)
+ 
+-#=================
+-# Check for neon library. Prefer external, otherwise internal.
+-WITH_NEON_SUBDIR=
+-WITH_NEON_INCLUDE=
+-WITH_NEON_LIB=
+-AC_CHECK_HEADER([neon/ne_session.h], [
+-  AC_CHECK_LIB(neon, ne_session_create, [
+-    AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the 'neon' library (-lneon).])
+-    AC_CHECK_LIB(neon, ne_get_response_header, [
+-      AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.])
+-    ])
+-    AC_CHECK_LIB(neon, ne_send_request_chunk, [
+-	AC_DEFINE(HAVE_NEON_NE_SEND_REQUEST_CHUNK, 1, [Define to 1 if you have ne_send_request_chunk() in libneon.])
+-    ])
+-    WITH_NEON_INCLUDE="-I${includedir}/neon"
+-    WITH_NEON_LIB="-lneon"
+-  ])
+-],[
+-  if test -d neon ; then
+-    AC_DEFINE(HAVE_LIBNEON, 1, [Define to 1 if you have the 'neon' library (-lneon).])
+-# XXX HAVE_NEON_NE_GET_RESPONSE_HEADER assumes libneon-0.25 devel internal
+-    AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.])
+-    WITH_NEON_SUBDIR=neon
+-    WITH_NEON_INCLUDE="-I\${top_srcdir}/${WITH_NEON_SUBDIR}/src"
+-    WITH_NEON_LIB="\${top_builddir}/${WITH_NEON_SUBDIR}/src/libneon.la"
+-  fi
+-])
+ AC_SUBST(WITH_NEON_SUBDIR)
+ AC_SUBST(WITH_NEON_INCLUDE)
+ AC_SUBST(WITH_NEON_LIB)
 --- rpm-4.4.8/rpmio/rpmdav.c.orig	2007-02-20 00:51:07.000000000 +0100
 +++ rpm-4.4.8/rpmio/rpmdav.c	2007-04-08 20:07:07.814412143 +0200
 @@ -9,31 +9,6 @@