packages: nfs-utils/nfs-utils.spec - merged, cleaned and simplified heimdal...

[baggins]

Author: baggins                      Date: Sun Oct  3 18:03:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged, cleaned and simplified heimdal support patches

---- Files affected:
packages/nfs-utils:
   nfs-utils.spec (1.193 -> 1.194) 

---- Diffs:

================================================================
Index: packages/nfs-utils/nfs-utils.spec
diff -u packages/nfs-utils/nfs-utils.spec:1.193 packages/nfs-utils/nfs-utils.spec:1.194
--- packages/nfs-utils/nfs-utils.spec:1.193	Sun Oct  3 01:08:20 2010
+++ packages/nfs-utils/nfs-utils.spec	Sun Oct  3 20:03:12 2010
@@ -35,10 +35,7 @@
 Patch1:		%{name}-statdpath.patch
 Patch2:		%{name}-subsys.patch
 Patch3:		%{name}-union-mount.patch
-Patch4:		%{name}-kerberos-ac.patch
-Patch5:		%{name}-no_libgssapi.patch
-Patch6:		%{name}-pkgconfig_ac.patch
-Patch7:		%{name}-heimdal_functions.patch
+Patch7:		%{name}-heimdal.patch
 URL:		http://nfs.sourceforge.net/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -173,12 +170,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%if %{without krb5}
-%patch5 -p1
-%patch6 -p1
-%patch7 -p0
-%endif
+%patch7 -p1
 
 %build
 %{__libtoolize}
@@ -197,7 +189,7 @@
 	--with-statduser=rpcstatd \
 	--with-start-statd=%{_sbindir}/start-statd \
 	--with-tcp-wrappers \
-	--with-krb5-config=%{_bindir}/krb5-config
+	--with-krb5
 
 %{__make} all
 
@@ -417,6 +409,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.194  2010/10/03 18:03:12  baggins
+- merged, cleaned and simplified heimdal support patches
+
 Revision 1.193  2010/10/02 23:08:20  baggins
 - revert accidental removal
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils.spec?r1=1.193&r2=1.194&f=u