packages: nfs-utils/nfs-utils.spec - rel 4 - reverse heimdal bcond to krb5, ...

[baggins]

Author: baggins                      Date: Thu Jul  2 14:10:24 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- reverse heimdal bcond to krb5, build with heimdal

---- Files affected:
packages/nfs-utils:
   nfs-utils.spec (1.179 -> 1.180) 

---- Diffs:

================================================================
Index: packages/nfs-utils/nfs-utils.spec
diff -u packages/nfs-utils/nfs-utils.spec:1.179 packages/nfs-utils/nfs-utils.spec:1.180
--- packages/nfs-utils/nfs-utils.spec:1.179	Thu Jul  2 14:16:20 2009
+++ packages/nfs-utils/nfs-utils.spec	Thu Jul  2 16:10:18 2009
@@ -4,7 +4,7 @@
 #	uninstall (or in service nfs stop)
 #
 # Conditional build:
-%bcond_with	heimdal		# build with Heimdal Kerberos instead of MIT
+%bcond_with	krb5		# build with MIT Kerberos instead of Heimdal
 #
 Summary:	Kernel NFS server
 Summary(pl.UTF-8):	Działający na poziomie jądra serwer NFS
@@ -13,7 +13,7 @@
 Summary(uk.UTF-8):	Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:		nfs-utils
 Version:	1.2.0
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
@@ -42,12 +42,12 @@
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	cpp
-%if %{with heimdal}
-BuildRequires:	heimdal-devel >= 1.0
-BuildConflicts:	libgssglue-devel
-%else
+%if %{with krb5}
 BuildRequires:	krb5-devel >= 1.6
 BuildRequires:	libgssglue-devel >= 0.1
+%else
+BuildRequires:	heimdal-devel >= 1.0
+BuildConflicts:	libgssglue-devel
 %endif
 BuildRequires:	libblkid-devel
 BuildRequires:	libevent-devel >= 1.2
@@ -171,7 +171,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%{?with_heimdal:%patch5 -p1}
+%{!?with_krb5:%patch5 -p1}
 %patch6 -p1
 %patch7 -p0
 
@@ -405,6 +405,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.180  2009/07/02 14:10:18  baggins
+- rel 4
+- reverse heimdal bcond to krb5, build with heimdal
+
 Revision 1.179  2009/07/02 12:16:20  baggins
 - BC libgssglue-devel if build against heimdal
 
================================================================

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