From feb3a23794b0f372da4800dd3524476fa14565f9 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 14 Jul 2012 23:28:07 +0200
Subject: [PATCH] nfs-utils: use make_dirs.

---
 srcpkgs/nfs-utils/files/nfs-utils.tmpfiles.d | 4 ----
 srcpkgs/nfs-utils/nfs-utils-server.template  | 4 ++++
 srcpkgs/nfs-utils/template                   | 8 +++++---
 3 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 srcpkgs/nfs-utils/files/nfs-utils.tmpfiles.d

diff --git a/srcpkgs/nfs-utils/files/nfs-utils.tmpfiles.d b/srcpkgs/nfs-utils/files/nfs-utils.tmpfiles.d
deleted file mode 100644
index e2cf56c0dc6..00000000000
--- a/srcpkgs/nfs-utils/files/nfs-utils.tmpfiles.d
+++ /dev/null
@@ -1,4 +0,0 @@
-d	/var/lib/nfs/rpc_pipefs 	0755	root	root	-
-d	/var/lib/nfs/v4recovery		0755	root	root	-
-d	/var/lib/nfs/sm			0750	root	root	-
-d	/etc/exports.d			0750	root	root	-
diff --git a/srcpkgs/nfs-utils/nfs-utils-server.template b/srcpkgs/nfs-utils/nfs-utils-server.template
index a3a8f0e3495..3b68388b80e 100644
--- a/srcpkgs/nfs-utils/nfs-utils-server.template
+++ b/srcpkgs/nfs-utils/nfs-utils-server.template
@@ -10,6 +10,10 @@ replaces="nfs-utils<1.2.6_2"
 conf_files="/etc/exports"
 mutable_files="/var/lib/nfs/etab /var/lib/nfs/rmtab /var/lib/nfs/xtab"
 systemd_services="nfsd.service on rpc-mountd.service on"
+make_dirs="
+/var/lib/nfs/v4recovery 	0755    root    root
+/var/lib/nfs/sm 		0750    root    root
+/etc/exports.d			0750	root	root"
 
 do_install() {
 	vmove etc/exports etc
diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template
index 5039e4a5713..06ac4be15b1 100644
--- a/srcpkgs/nfs-utils/template
+++ b/srcpkgs/nfs-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'nfs-utils'
 pkgname=nfs-utils
 version=1.2.6
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
 --with-statedir=/var/lib/nfs --enable-libmount-mount
@@ -23,6 +23,10 @@ long_desc="
  The $pkgname package provides client utilities for the linux kernel
  implementation of NFS - Network File System."
 
+make_dirs="
+/var/lib/nfs/rpc_pipefs 0755	root	root
+/var/lib/nfs/sm 	0750	root	root"
+
 pre_install() {
 	# Makefile doesn't seem to create it!
 	vmkdir sbin
@@ -34,8 +38,6 @@ post_install() {
 	vinstall ${FILESDIR}/exports 644 etc
 	vinstall ${FILESDIR}/idmapd.conf 644 etc
 	# systemd glue
-	vinstall ${FILESDIR}/${pkgname}.tmpfiles.d 644 \
-		usr/lib/tmpfiles.d ${pkgname}.conf
 	vmkdir usr/lib/systemd/system
 	install -m644 ${FILESDIR}/*.{service,mount} \
 		${DESTDIR}/usr/lib/systemd/system