packages: nfs-utils/nfs-utils.spec - libtirpc and librpcsecgss are alternat...

[qboosh]

Author: qboosh                       Date: Wed Aug 18 04:59:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- libtirpc and librpcsecgss are alternatives here

---- Files affected:
packages/nfs-utils:
   nfs-utils.spec (1.184 -> 1.185) 

---- Diffs:

================================================================
Index: packages/nfs-utils/nfs-utils.spec
diff -u packages/nfs-utils/nfs-utils.spec:1.184 packages/nfs-utils/nfs-utils.spec:1.185
--- packages/nfs-utils/nfs-utils.spec:1.184	Tue Aug 17 18:54:27 2010
+++ packages/nfs-utils/nfs-utils.spec	Wed Aug 18 06:59:51 2010
@@ -5,6 +5,7 @@
 #
 # Conditional build:
 %bcond_with	krb5		# build with MIT Kerberos instead of Heimdal
+%bcond_without	tirpc		# use librpcsecgss instead of libtirpc
 #
 Summary:	Kernel NFS server
 Summary(pl.UTF-8):	Działający na poziomie jądra serwer NFS
@@ -42,23 +43,25 @@
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	cpp
-%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:	libcap-devel
 BuildRequires:	libevent-devel >= 1.2
 BuildRequires:	libnfsidmap-devel >= 0.21-3
-BuildRequires:	librpcsecgss-devel >= 0.16
-BuildRequires:	libtirpc-devel >= 1:0.1.10-4
 BuildRequires:	libtool
 BuildRequires:	libwrap-devel
 BuildRequires:	pkgconfig
-BuildRequires:	sed >= 4.0
+%if %{with tirpc}
+BuildRequires:	libtirpc-devel >= 1:0.1.10-4
+%else
+BuildRequires:	librpcsecgss-devel >= 0.16
+%endif
+%if %{with krb5}
+BuildRequires:	krb5-devel >= 1.6
+BuildRequires:	libgssglue-devel >= 0.1
+%else
+BuildRequires:	heimdal-devel >= 1.0
+BuildConflicts:	libgssglue-devel
+%endif
 # lucid context fields mismatch with current version of spkm3.h
 BuildConflicts:	gss_mech_spkm3-devel
 Requires(post):	fileutils
@@ -187,7 +190,7 @@
 	--enable-nfsv4 \
 	--enable-gss \
 	--enable-mount \
-	--enable-tirpc \
+	--%{?with_tirpc:en}%{!?with_tirpc:dis}able-tirpc \
 	--enable-ipv6 \
 	--with-statedir=/var/lib/nfs \
 	--with-statduser=rpcstatd \
@@ -403,6 +406,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.185  2010/08/18 04:59:51  qboosh
+- libtirpc and librpcsecgss are alternatives here
+
 Revision 1.184  2010/08/17 16:54:27  qboosh
 - removed obsolete dprintf hack
 
================================================================

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