From 4b5d4d9fd704e172abadcd4a7c71556cc3a87a00 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 2 Jan 2013 17:32:39 +0100 Subject: [PATCH] nfs-utils: use proper fstype for proc-fs-nfsd.mount. --- srcpkgs/nfs-utils/files/proc-fs-nfsd.mount | 4 ++-- srcpkgs/nfs-utils/nfs-utils-server.template | 5 +---- srcpkgs/nfs-utils/template | 16 +++++++--------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount b/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount index 3e807e4bebd..5993bb12929 100644 --- a/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount +++ b/srcpkgs/nfs-utils/files/proc-fs-nfsd.mount @@ -1,8 +1,8 @@ [Unit] -Description=RPC Pipe File System +Description=NFS Daemon filesystem DefaultDependencies=no [Mount] What=sunrpc Where=/proc/fs/nfsd -Type=rpc_pipefs +Type=nfsd diff --git a/srcpkgs/nfs-utils/nfs-utils-server.template b/srcpkgs/nfs-utils/nfs-utils-server.template index 53b189d5597..d46107e30b1 100644 --- a/srcpkgs/nfs-utils/nfs-utils-server.template +++ b/srcpkgs/nfs-utils/nfs-utils-server.template @@ -1,9 +1,6 @@ # Template file for 'nfs-utils-server'. # -short_desc="Network File System utilities -- Server" -long_desc=" - This package contains utilities to administer the Linux kernel - implementation of NFS (Network File System) servers." +short_desc="Network File System utilities -- Server utilities" depends="rpcbind" replaces="nfs-utils<1.2.6_2" diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index c3008d80374..9ed327ea61d 100644 --- a/srcpkgs/nfs-utils/template +++ b/srcpkgs/nfs-utils/template @@ -1,25 +1,23 @@ # Template file for 'nfs-utils' pkgname=nfs-utils version=1.2.7 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4 --with-statedir=/var/lib/nfs --enable-libmount-mount --without-tcp-wrappers --enable-ipv6 --sbindir=/usr/sbin" -depends="rpcbind" -subpackages="$pkgname-server" -makedepends="pkg-config libblkid-devel libmount-devel libtirpc-devel - librpcsecgss-devel libnfsidmap-devel libevent-devel device-mapper-devel - libcap-devel mit-krb5-devel sqlite-devel" short_desc="Network File System client utilities" maintainer="Juan RP " license="GPL-2" homepage="http://nfs.sourceforge.net" distfiles="${KERNEL_SITE}/utils/${pkgname}/${version}/${pkgname}-${version}.tar.xz" checksum=d78768a0819c5eeed5e5abb6c4c9048962e9f8b9ef45451ea4db6aee38720121 -long_desc=" - The $pkgname package provides client utilities for the linux kernel - implementation of NFS - Network File System." + +depends="rpcbind" +subpackages="$pkgname-server" +makedepends="pkg-config libblkid-devel libmount-devel libtirpc-devel + librpcsecgss-devel libnfsidmap-devel libevent-devel device-mapper-devel + libcap-devel mit-krb5-devel sqlite-devel" conf_files="/etc/idmapd.conf"