packages: heimdal/heimdal-krb5config-nosysdirs.patch, heimdal/heimdal.spec ...

[qboosh]

Author: qboosh                       Date: Fri Oct  8 20:47:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more fixes in nosysdirs patch
- BR: libcap-ng-devel, pkgconfig; updated am version

---- Files affected:
packages/heimdal:
   heimdal-krb5config-nosysdirs.patch (1.1 -> 1.2) , heimdal.spec (1.211 -> 1.212) 

---- Diffs:

================================================================
Index: packages/heimdal/heimdal-krb5config-nosysdirs.patch
diff -u packages/heimdal/heimdal-krb5config-nosysdirs.patch:1.1 packages/heimdal/heimdal-krb5config-nosysdirs.patch:1.2
--- packages/heimdal/heimdal-krb5config-nosysdirs.patch:1.1	Thu Oct  7 21:22:01 2010
+++ packages/heimdal/heimdal-krb5config-nosysdirs.patch	Fri Oct  8 22:47:06 2010
@@ -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

================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.211 packages/heimdal/heimdal.spec:1.212
--- packages/heimdal/heimdal.spec:1.211	Thu Oct  7 21:22:01 2010
+++ packages/heimdal/heimdal.spec	Fri Oct  8 22:47:06 2010
@@ -39,16 +39,18 @@
 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
@@ -793,6 +795,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212  2010/10/08 20:47:06  qboosh
+- more fixes in nosysdirs patch
+- BR: libcap-ng-devel, pkgconfig; updated am version
+
 Revision 1.211  2010/10/07 19:22:01  qboosh
 - added krb5config-nosysdirs patch to kill system dirs from krb5-config -L/-I
   (messed linking within packages, like linking with old installed lib instead of new)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-krb5config-nosysdirs.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.211&r2=1.212&f=u