- more fixes in nosysdirs patch

- BR: libcap-ng-devel, pkgconfig; updated am version

Changed files:
    heimdal-krb5config-nosysdirs.patch -> 1.2
    heimdal.spec -> 1.212

diff --git a/heimdal-krb5config-nosysdirs.patch b/heimdal-krb5config-nosysdirs.patch
index 28584504d0fd9a8168aa5d0d81d2aa32897444e2..53e07493e1b2bb5441008ae25e1db48f36a589c1 100644 (file)
--- a/heimdal-krb5config-nosysdirs.patch
+++ b/heimdal-krb5config-nosysdirs.patch
@@ -18,3 +18,36 @@
  fi
  
  exit 0
+--- heimdal-1.4/cf/test-package.m4.orig        2010-09-13 09:23:34.000000000 +0200
++++ heimdal-1.4/cf/test-package.m4     2010-10-08 20:18:05.375741882 +0200
+@@ -98,18 +98,20 @@
+                       found=yes])
+       fi
+       if test "$found" = no; then
+-              ires= lres=
+-              for i in $header_dirs; do
+-                      CFLAGS="-I$i $save_CFLAGS"
+-                      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[ires=$i;break])
++              ires=no lres=no
++              for i in '' $header_dirs; do
++                      iopt="${i:+-I$i}"
++                      CFLAGS="$iopt $save_CFLAGS"
++                      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[ires=$iopt;break])
+               done
+-              for i in $lib_dirs; do
+-                      LIBS="-L$i $3 $4 $save_LIBS"
+-                      AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[lres=$i;break])
++              for i in '' $lib_dirs; do
++                      lopt="${i:+-L$i}"
++                      LIBS="$lopt $3 $4 $save_LIBS"
++                      AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[lres=$lopt;break])
+               done
+-              if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
+-                      INCLUDE_$1="-I$ires"
+-                      LIB_$1="-L$lres $3 $4"
++              if test "$ires" != "no" -a "$lres" != "no" -a "$with_$1" != "no"; then
++                      INCLUDE_$1="$ires"
++                      LIB_$1="$lres $3 $4"
+                       found=yes
+                       AC_MSG_RESULT([headers $ires, libraries $lres])
+               fi

diff --git a/heimdal.spec b/heimdal.spec
index 677f8e6daf130519445574b127e451973fab12ad..47212fef04810e2783b8afe9abc1ecfded4ec8ea 100644 (file)
--- a/heimdal.spec
+++ b/heimdal.spec
@@ -38,16 +38,18 @@ Patch11:    %{name}-ntlm-digest.patch
 Patch12:       %{name}-krb5config-nosysdirs.patch
 URL:           http://www.h5l.org/
 BuildRequires: autoconf >= 2.62
-BuildRequires: automake
+BuildRequires: automake >= 1:1.10.3
 BuildRequires: bison
 BuildRequires: db-devel
 BuildRequires: flex
+BuildRequires: libcap-ng-devel >= 0.4.0
 BuildRequires: libcom_err-devel >= 1.34-5
 BuildRequires: libtool >= 2:2.2
 BuildRequires: mawk
 BuildRequires: ncurses-devel >= 5.1
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: pkgconfig
 BuildRequires: readline-devel >= 5.0
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sqlite3-devel