X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=nfs-utils.spec;h=2eb8f61c551e63cb75b48568f4f3640c48c2cabe;hb=dc4877f3076ae83af079dbf83d0d6990168051b9;hp=0e25ba7e119e3fa20e70cfdd29b8d5d959004c91;hpb=f6e2d8d1e606e757e3648abc5ae89603f94054a5;p=packages%2Fnfs-utils.git

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 0e25ba7..2eb8f61 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,22 +1,21 @@
-# TODO
-# - should unmount /proc/fs/nfsd and /var/lib/nfs/rpc_pipefs at package
-#	uninstall (or in service nfs stop)
+# TODO: systemd support needs cleanup (see TODOs below)
 #
 # 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
 Summary(pt_BR.UTF-8):	Os utilitários para o cliente e servidor NFS do Linux
 Summary(ru.UTF-8):	Утилиты для NFS и демоны поддержки для NFS-сервера ядра
 Summary(uk.UTF-8):	Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:		nfs-utils
-Version:	1.2.2
-Release:	2
+Version:	2.3.4
+Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
-# Source0-md5:	dad92f64db3266c7757f71bb53ee8f35
+Source0:	https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	70fdbb678c21c4d8b362b43247f4b39a
 #Source1:	ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:	nfs.doc.tar.gz
 # Source1-md5:	ae7db9c61c5ad04f83bb99e5caed73da
@@ -29,47 +28,71 @@ Source7:	rpcsvcgssd.init
 Source8:	nfs.sysconfig
 Source9:	nfslock.sysconfig
 Source10:	nfsfs.sysconfig
+Source11:	blkmapd.init
+Source12:	sunrpc.conf
+Source13:	%{name}_env.sh
+Source102:	nfsd.service
+Source103:	nfs-blkmapd.service
+Source104:	nfs-exportfs.service
+Source105:	nfs-gssd.service
+Source106:	nfs-idmapd.service
+Source107:	nfs-lock.service
+Source108:	nfs-mountd.service
+Source109:	nfs-svcgssd.service
+Source110:	nfsd.postconfig
+Source111:	nfsd.preconfig
+Source112:	nfs-lock.preconfig
 Patch0:		%{name}-install.patch
 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
-URL:		http://nfs.sourceforge.net/
+Patch4:		%{name}-heimdal.patch
+Patch5:		%{name}-x32.patch
+Patch6:		libnfsidmap-pluginpath.patch
+Patch7:		%{name}-types.patch
+URL:		http://linux-nfs.org/
 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:	device-mapper-devel
+BuildRequires:	keyutils-devel
+BuildRequires:	libblkid-devel >= 1.40
 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:	libmount-devel
 BuildRequires:	libtool
 BuildRequires:	libwrap-devel
+BuildRequires:	openldap-devel
 BuildRequires:	pkgconfig
-BuildRequires:	sed >= 4.0
+BuildRequires:	rpm-pythonprov
+BuildRequires:	sqlite3-devel >= 3.3
+%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
+%else
+BuildRequires:	heimdal-devel >= 1.0
+%endif
+BuildRequires:	rpmbuild(macros) >= 1.623
 # lucid context fields mismatch with current version of spkm3.h
 BuildConflicts:	gss_mech_spkm3-devel
 Requires(post):	fileutils
 Requires(post):	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-common = %{version}-%{release}
+Requires:	libevent >= 2.0.14-2
 Requires:	rc-scripts >= 0.4.1.5
 Requires:	rpcbind >= 0.1.7
 Requires:	setup >= 2.4.6-7
+Requires:	systemd-units >= 0.38
 Provides:	nfsdaemon
 Obsoletes:	knfsd
 Obsoletes:	nfs-server
+Obsoletes:	nfs-utils-systemd
 Obsoletes:	nfsdaemon
 Conflicts:	kernel < 2.2.5
 Conflicts:	krb5-common < 1.7
@@ -106,13 +129,16 @@ Summary:	Clients for connecting to a remote NFS server
 Summary(pl.UTF-8):	Klienci do łączenia się ze zdalnym serwerem NFS
 Group:		Networking
 Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	psmisc
 Requires:	rc-scripts
+Requires:	systemd-units >= 0.38
 Provides:	nfs-server-clients
 Provides:	nfsclient
 Obsoletes:	knfsd-clients
 Obsoletes:	nfs-server-clients
+Obsoletes:	nfs-utils-clients-systemd
 Obsoletes:	nfsclient
 Conflicts:	krb5-common < 1.7
 
@@ -130,32 +156,24 @@ hoście. Na przykład, showmount potrafi pokazać klientów, którzy są
 zamountowani na tym serwerze. Ten pakiet nie jest konieczny do
 zamountowania zasobów NFS.
 
-%package lock
-Summary:	Programs for NFS file locking
-Summary(pl.UTF-8):	Programy do obsługi blokowania plików poprzez NFS (lock)
+%package common
+Summary:	Common programs for NFS
+Summary(pl.UTF-8):	Wspólne programy do obsługi NFS
 Group:		Networking
 Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun,postun):	systemd-units >= 38
+Requires:	libnfsidmap = %{version}-%{release}
 Requires:	rc-scripts
 Requires:	rpcbind >= 0.1.7
+Requires:	systemd-units >= 0.38
 Provides:	group(rpcstatd)
+Provides:	nfs-utils-lock
 Provides:	nfslockd
 Provides:	user(rpcstatd)
 Obsoletes:	knfsd-lock
+Obsoletes:	nfs-utils-common-systemd
+Obsoletes:	nfs-utils-lock
 Obsoletes:	nfslockd
-
-%description lock
-The nfs-lock pacage contains programs which support the NFS file lock.
-Install nfs-lock if you want to use file lock over NFS.
-
-%description lock -l pl.UTF-8
-Ten pakiet zawiera programy umożliwiające wykonywanie blokowania
-plików (file locking) poprzez NFS.
-
-%package common
-Summary:	Common programs for NFS
-Summary(pl.UTF-8):	Wspólne programy do obsługi NFS
-Group:		Networking
-Requires:	libnfsidmap >= 0.21-3
 Conflicts:	mount < 2.13-0.pre7.1
 
 %description common
@@ -164,6 +182,45 @@ Common programs for NFS.
 %description common -l pl.UTF-8
 Wspólne programy do obsługi NFS.
 
+%package -n libnfsidmap
+Summary:	Library to help mapping id's, mainly for NFSv4
+Summary(pl.UTF-8):	Biblioteka pomagająca w mapowaniu identyfikatorów, głównie dla NFSv4
+License:	BSD
+Group:		Libraries
+Obsoletes:	nfsidmap
+
+%description -n libnfsidmap
+Library to help mapping id's, mainly for NFSv4.
+
+%description -n libnfsidmap -l pl.UTF-8
+Biblioteka pomagająca w mapowaniu identyfikatorów, głównie dla NFSv4.
+
+%package -n libnfsidmap-devel
+Summary:	Header files for libnfsidmap library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libnfsidmap
+Group:		Development/Libraries
+Requires:	libnfsidmap = %{version}-%{release}
+Obsoletes:	nfsidmap-devel
+
+%description -n libnfsidmap-devel
+Header files for libnfsidmap library.
+
+%description -n libnfsidmap-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libnfsidmap.
+
+%package -n libnfsidmap-static
+Summary:	Static libnfsidmap library
+Summary(pl.UTF-8):	Statyczna biblioteka libnfsidmap
+Group:		Development/Libraries
+Requires:	libnfsidmap-devel = %{version}-%{release}
+Obsoletes:	nfsidmap-static
+
+%description -n libnfsidmap-static
+Static libnfsidmap library.
+
+%description -n libnfsidmap-static -l pl.UTF-8
+Statyczna biblioteka libnfsidmap.
+
 %prep
 %setup -q -a1
 %patch0 -p1
@@ -171,12 +228,9 @@ Wspólne programy do obsługi NFS.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%{!?with_krb5:%patch5 -p1}
+%patch5 -p1
 %patch6 -p1
-%patch7 -p0
-
-# conflict with GNU stdio extension
-sed -i -e 's/dprintf/dbgprintf/' support/include/ha-callout.h utils/statd/*.[ch]
+%patch7 -p1
 
 %build
 %{__libtoolize}
@@ -185,39 +239,67 @@ sed -i -e 's/dprintf/dbgprintf/' support/include/ha-callout.h utils/statd/*.[ch]
 %{__autoheader}
 %{__automake}
 %configure \
-	--enable-nfsv3 \
 	--enable-nfsv4 \
+	--enable-nfsv41 \
 	--enable-gss \
+	--enable-libmount-mount \
 	--enable-mount \
-	--enable-tirpc \
+	--enable-mountconfig \
+	--enable-svcgss \
+%if %{with tirpc}
 	--enable-ipv6 \
+	--enable-tirpc \
+%else
+	--disable-ipv6 \
+	--disable-tirpc \
+%endif
+	--with-statdpath=/var/lib/nfs/statd \
 	--with-statedir=/var/lib/nfs \
 	--with-statduser=rpcstatd \
-	--with-start-statd=%{_sbindir}/start-statd \
-	--with-tcp-wrappers \
-	--with-krb5-config=%{_bindir}/krb5-config
+	--with-start-statd=/sbin/start-statd \
+	--without-gssglue \
+	--with-krb5 \
+	--with-systemd=%{systemdunitdir} \
+	--with-tcp-wrappers
 
-%{__make} all
+%{__make} pkgplugindir=/%{_lib}/libnfsidmap
+# all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig} \
-	$RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery}
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,exports.d,modprobe.d} \
+	$RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery} \
+	$RPM_BUILD_ROOT%{_datadir}/nfs-utils
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	pkgplugindir=/%{_lib}/libnfsidmap \
+	generator_dir=/lib/systemd/system-generators
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.la
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/libnfsidmap/*.{a,la}
+
+mv -f $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libnfsidmap.so.*.*.*) \
+	$RPM_BUILD_ROOT%{_libdir}/libnfsidmap.so
 
-cat >$RPM_BUILD_ROOT%{_sbindir}/start-statd <<EOF
+install -p support/nfsidmap/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -p utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc
+
+%{__rm} $RPM_BUILD_ROOT%{_sbindir}/start-statd
+cat >$RPM_BUILD_ROOT/sbin/start-statd <<EOF
 #!/bin/sh
 # mount.nfs calls this script when mounting a filesystem with locking
 # enabled, but when statd does not seem to be running (based on
 # /var/run/rpc.statd.pid).
-exec /sbin/service nfslock start
+exec /sbin/rpc.statd --no-notify
 EOF
 
-sed -e "s|#!/bin/bash|#!/bin/sh|" utils/gssd/gss_destroy_creds > $RPM_BUILD_ROOT%{_sbindir}/gss_destroy_creds
+%{__sed} -i -e 's|%{_sbindir}nfsidmap|/sbin/nfsidmap|g' $RPM_BUILD_ROOT%{_mandir}/man8/nfsidmap.8
 
-mv $RPM_BUILD_ROOT%{_sbindir}/rpcdebug $RPM_BUILD_ROOT/sbin
+for f in rpcdebug blkmapd nfsidmap rpc.gssd rpc.idmapd rpc.statd ; do
+	%{__mv} $RPM_BUILD_ROOT%{_sbindir}/$f $RPM_BUILD_ROOT/sbin
+done
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
@@ -225,15 +307,42 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfsfs
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/idmapd
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/gssd
 install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/svcgssd
+install %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/blkmapd
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/nfsd
 install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/nfslock
 install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
 
+install %{SOURCE12} $RPM_BUILD_ROOT/etc/modprobe.d/sunrpc.conf
+
+#install systemd/proc-fs-nfsd.mount $RPM_BUILD_ROOT%{systemdunitdir}/proc-fs-nfsd.mount
+#install systemd/var-lib-nfs-rpc_pipefs.mount $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+# TODO: upstream installs nfs-server.service
+install %{SOURCE102} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd.service
+# TODO: upstream installs nfs-blkmap.service
+install %{SOURCE103} $RPM_BUILD_ROOT%{systemdunitdir}/blkmapd.service
+install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-exportfs.service
+# TODO: upstream installs rpc-gssd.service
+install %{SOURCE105} $RPM_BUILD_ROOT%{systemdunitdir}/gssd.service
+# TODO: upstream installs nfs-idmapd.service
+install %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/idmapd.service
+# TODO: upstream installs rpc-statd.service + nfs-statd-notify.service
+install %{SOURCE107} $RPM_BUILD_ROOT%{systemdunitdir}/nfslock.service
+# TODO: upstream installs nfs-mountd.service
+install %{SOURCE108} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-mountd.service
+# TODO: upstream installs auth-rpcgss-module.service / nfs-svcgssd.service
+install %{SOURCE109} $RPM_BUILD_ROOT%{systemdunitdir}/svcgssd.service
+install %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.postconfig
+install %{SOURCE111} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.preconfig
+install %{SOURCE112} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfslock.preconfig
+
+# Disable old SysV service for systemd installs
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/nfs.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/nfsfs.service
+
 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports
 
-rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,statd,sm-notify}.8
-rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{svcgssd,gssd,idmapd}.8
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,statd,sm-notify,svcgssd,gssd,idmapd}.8
 echo ".so mountd.8"  > 	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.mountd.8
 echo ".so nfsd.8"    >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.nfsd.8
 echo ".so statd.8"   >	$RPM_BUILD_ROOT%{_mandir}/man8/rpc.statd.8
@@ -248,6 +357,9 @@ ln -sf /bin/true $RPM_BUILD_ROOT/sbin/fsck.nfs
 
 cp -a nfs html
 
+# make python dep optional
+chmod a-x $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsiostat}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -256,6 +368,7 @@ rm -rf $RPM_BUILD_ROOT
 %service nfs restart "NFS daemon"
 /sbin/chkconfig --add svcgssd
 %service svcgssd restart "RPC svcgssd"
+%systemd_post nfsd.service nfsd-exportfs.service nfsd-mountd.service svcgssd.service
 
 %preun
 if [ "$1" = "0" ]; then
@@ -264,12 +377,19 @@ if [ "$1" = "0" ]; then
 	%service svcgssd stop
 	/sbin/chkconfig --del svcgssd
 fi
+%systemd_preun nfsd.service nfsd-exportfs.service nfsd-mountd.service svcgssd.service
+
+%postun
+%systemd_reload
 
 %post clients
 /sbin/chkconfig --add nfsfs
 %service nfsfs restart
 /sbin/chkconfig --add gssd
 %service gssd restart "RPC gssd"
+/sbin/chkconfig --add blkmapd
+%service blkmapd restart "pNFS blkmapd"
+%systemd_post blkmapd.service gssd.service
 
 %preun clients
 if [ "$1" = "0" ]; then
@@ -277,124 +397,221 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del nfsfs
 	%service gssd stop
 	/sbin/chkconfig --del gssd
+	%service blkmapd stop
+	/sbin/chkconfig --del blkmapd
 fi
+%systemd_preun blkmapd.service gssd.service
+
+%postun clients
+%systemd_reload
 
-%pre lock
+%pre common
 %groupadd -g 191 rpcstatd
 %useradd -u 191 -d /var/lib/nfs/statd -s /bin/false -c "RPC statd user" -g rpcstatd rpcstatd
 
-%post lock
+%post common
+/sbin/chkconfig --add idmapd
+%service idmapd restart "RPC idmapd"
 /sbin/chkconfig --add nfslock
 %service nfslock restart "RPC statd"
+%systemd_post idmapd.service nfslock.service
 
-%preun lock
+%preun common
 if [ "$1" = "0" ]; then
+	%service idmapd stop
+	/sbin/chkconfig --del idmapd
 	%service nfslock stop
 	/sbin/chkconfig --del nfslock
 fi
+%systemd_preun idmapd.service nfslock.service
 
-%postun lock
+%postun common
 if [ "$1" = "0" ]; then
 	%userremove rpcstatd
 	%groupremove rpcstatd
 fi
-
-%post common
-/sbin/chkconfig --add idmapd
-%service idmapd restart "RPC idmapd"
-
-%preun common
-if [ "$1" = "0" ]; then
-	%service idmapd stop
-	/sbin/chkconfig --del idmapd
+%systemd_reload
+
+%triggerpostun -- %{name} < 1.2.5-7
+if [ -f /etc/sysconfig/nfsd ]; then
+	. /etc/sysconfig/nfsd
+	__RPCMOUNTDOPTIONS=
+	[ -n "$MOUNTD_PORT" ] && __RPCMOUNTDOPTIONS="-p $MOUNTD_PORT"
+	for vers in 2 3 4 ; do
+		__var=$(eval echo \$NFSv$vers)
+		[ -n "$__var" -a "$__var" != "yes" ] && \
+			__RPCMOUNTDOPTIONS="$__RPCMOUNTDOPTIONS --no-nfs-version $vers"
+	done
+	if [ -n "$__RPCMOUNTDOPTIONS" ]; then
+		%{__cp} -f /etc/sysconfig/nfsd{,.rpmsave}
+		echo >>/etc/sysconfig/nfsd
+		echo "# Added by rpm trigger" >>/etc/sysconfig/nfsd
+		echo "RPCMOUNTDOPTIONS=\"$RPCMOUNTOPTIONS $__RPCMOUNTDOPTIONS\"" >>/etc/sysconfig/nfsd
+	fi
 fi
+%systemd_trigger nfsd.service nfsd-exportfs.service nfsd-mountd.service svcgssd.service
 
-%triggerpostun -- %{name} < 1.1.0-0.rc1.1
-/sbin/chkconfig nfs reset
-/sbin/chkconfig svcgssd reset
-
-%triggerpostun lock -- %{name}-lock < 1.1.0-0.rc1.1
-/sbin/chkconfig nfslock reset
+%triggerpostun clients -- %{name}-clients < 1.2.5-7
+%systemd_trigger blkmapd.service gssd.service
 
-%triggerpostun clients -- %{name}-clients < 1.1.0-0.rc1.1
-if [ -f /etc/sysconfig/nfsclient.rpmsave ]; then
-	mv -f /etc/sysconfig/nfsfs{,.rpmnew}
-	mv -f /etc/sysconfig/nfsclient.rpmsave /etc/sysconfig/nfsfs
+%triggerpostun common -- %{name}-lock < 1.2.5-3
+if [ -f /etc/sysconfig/nfslock.rpmsave ]; then
+	mv -f /etc/sysconfig/nfslock{,.rpmnew}
+	mv -f /etc/sysconfig/nfslock.rpmsave /etc/sysconfig/nfslock
 fi
-/sbin/chkconfig nfsfs reset
-/sbin/chkconfig gssd reset
 
-%triggerpostun common -- %{name}-common < 1.1.0-0.rc1.1
-/sbin/chkconfig idmapd reset
+%triggerpostun common -- %{name}-common < 1.2.5-7
+if [ -f /etc/sysconfig/nfslock ]; then
+	. /etc/sysconfig/nfslock
+	[ -n "$STATD_PORT" ] && STATDOPTS="$STATDOPTS -p $STATD_PORT"
+	[ -n "$STATD_OUTPORT" ] && STATDOPTS="$STATDOPTS -o $STATD_OUTPORT"
+	if [ -n "$STATDOPTS" ]; then
+		%{__cp} -f /etc/sysconfig/nfslock{,.rpmsave}
+		echo >>/etc/sysconfig/nfslock
+		echo "# Added by rpm trigger" >>/etc/sysconfig/nfslock
+		echo "STATDOPTIONS=\"$STATDOPTS\"" >>/etc/sysconfig/nfslock
+	fi
+fi
+%systemd_trigger idmapd.service nfslock.service
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README html
+%doc README html
+%attr(755,root,root) /sbin/nfsdcld
+%attr(755,root,root) /sbin/nfsdcltrack
 %attr(755,root,root) /sbin/rpcdebug
 %attr(755,root,root) /sbin/fsck.nfs
 %attr(755,root,root) %{_sbindir}/exportfs
 %attr(755,root,root) %{_sbindir}/rpc.mountd
 %attr(755,root,root) %{_sbindir}/rpc.nfsd
+%attr(755,root,root) %{_sbindir}/rpc.svcgssd
 %attr(755,root,root) %{_sbindir}/nfsstat
 
 %attr(754,root,root) /etc/rc.d/init.d/nfs
+%attr(754,root,root) /etc/rc.d/init.d/svcgssd
 
 %attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/exports
+%dir %{_sysconfdir}/exports.d
+
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsd
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/xtab
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/etab
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/rmtab
 
 %{_mandir}/man5/exports.5*
+%{_mandir}/man5/nfs.conf.5*
 %{_mandir}/man7/nfsd.7*
+%{_mandir}/man7/nfs.systemd.7*
 %{_mandir}/man8/exportfs.8*
 %{_mandir}/man8/mountd.8*
 %{_mandir}/man8/nfsd.8*
+%{_mandir}/man8/nfsdcld.8*
+%{_mandir}/man8/nfsdcltrack.8*
 %{_mandir}/man8/nfsstat.8*
 %{_mandir}/man8/rpc.mountd.8*
 %{_mandir}/man8/rpc.nfsd.8*
+%{_mandir}/man8/rpc.svcgssd.8*
 %{_mandir}/man8/rpcdebug.8*
-%attr(754,root,root) /etc/rc.d/init.d/svcgssd
-%attr(755,root,root) %{_sbindir}/rpc.svcgssd
-%{_mandir}/man8/*svcgss*
+%{_mandir}/man8/svcgssd.8*
 
-%files lock
-%defattr(644,root,root,755)
-%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd
-%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm
-%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm.bak
-%attr(600,rpcstatd,rpcstatd) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/statd/state
-%attr(755,root,root) %{_sbindir}/rpc.statd
-%attr(755,root,root) %{_sbindir}/sm-notify
-%attr(755,root,root) %{_sbindir}/start-statd
-%attr(754,root,root) /etc/rc.d/init.d/nfslock
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfslock
-%{_mandir}/man8/*statd.8*
-%{_mandir}/man8/*sm-notify.8*
+%{systemdunitdir}/nfs.service
+%{systemdunitdir}/nfsd.service
+%{systemdunitdir}/nfsd-exportfs.service
+%{systemdunitdir}/nfsd-mountd.service
+%{systemdunitdir}/svcgssd.service
+%{systemdunitdir}/proc-fs-nfsd.mount
+%attr(755,root,root) %{_datadir}/nfs-utils/nfsd.postconfig
+%attr(755,root,root) %{_datadir}/nfs-utils/nfsd.preconfig
 
 %files clients
 %defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/blkmapd
+%attr(754,root,root) /etc/rc.d/init.d/gssd
 %attr(754,root,root) /etc/rc.d/init.d/nfsfs
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsfs
-%attr(755,root,root) %{_sbindir}/showmount
-%{_mandir}/man8/showmount.8*
+%attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) /etc/nfsmount.conf
 %attr(4755,root,root) /sbin/mount.nfs
 %attr(4755,root,root) /sbin/umount.nfs
 %attr(4755,root,root) /sbin/mount.nfs4
 %attr(4755,root,root) /sbin/umount.nfs4
-%{_mandir}/man8/*mount.nfs.8*
-%attr(754,root,root) /etc/rc.d/init.d/gssd
-%attr(755,root,root) %{_sbindir}/rpc.gssd
-%{_mandir}/man8/rpc.gssd*
-%{_mandir}/man8/gssd*
+%attr(755,root,root) /sbin/blkmapd
+%attr(755,root,root) /sbin/rpc.gssd
+%attr(755,root,root) %{_sbindir}/mountstats
+%attr(755,root,root) %{_sbindir}/nfsiostat
+%attr(755,root,root) %{_sbindir}/showmount
+%{_mandir}/man5/nfsmount.conf.5*
+%{_mandir}/man8/blkmapd.8*
+%{_mandir}/man8/gssd.8*
+%{_mandir}/man8/mount.nfs.8*
+%{_mandir}/man8/mountstats.8*
+%{_mandir}/man8/nfsiostat.8*
+%{_mandir}/man8/rpc.gssd.8*
+%{_mandir}/man8/showmount.8*
+%{_mandir}/man8/umount.nfs.8*
+
+%{systemdunitdir}/nfsfs.service
+%{systemdunitdir}/blkmapd.service
+%{systemdunitdir}/gssd.service
 
 %files common
 %defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfslock
+%attr(754,root,root) /etc/rc.d/init.d/idmapd
+%attr(754,root,root) /etc/rc.d/init.d/nfslock
+%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/sunrpc.conf
+%attr(755,root,root) /sbin/nfsidmap
+%attr(755,root,root) /sbin/rpc.idmapd
+%attr(755,root,root) /sbin/rpc.statd
+%attr(755,root,root) /sbin/start-statd
+%attr(755,root,root) %{_sbindir}/nfsconf
+%attr(755,root,root) %{_sbindir}/sm-notify
 %dir %{_var}/lib/nfs
 %dir %{_var}/lib/nfs/rpc_pipefs
 %dir %{_var}/lib/nfs/v4recovery
-%{_mandir}/man5/nfs*
-%attr(754,root,root) /etc/rc.d/init.d/idmapd
-%attr(755,root,root) %{_sbindir}/gss_*
-%attr(755,root,root) %{_sbindir}/rpc.idmapd
-%{_mandir}/man[58]/*idmap*
+%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd
+%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm
+%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd/sm.bak
+%attr(600,rpcstatd,rpcstatd) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/statd/state
+%attr(755,root,root) /lib/systemd/system-generators/nfs-server-generator
+%attr(755,root,root) /lib/systemd/system-generators/rpc-pipefs-generator
+%{systemdunitdir}/idmapd.service
+%{systemdunitdir}/nfslock.service
+%{systemdunitdir}/rpc_pipefs.target
+%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+%dir %{_datadir}/nfs-utils
+%attr(755,root,root) %{_datadir}/nfs-utils/nfslock.preconfig
+%{_mandir}/man5/nfs.5*
+%{_mandir}/man8/idmapd.8*
+%{_mandir}/man8/nfsconf.8*
+%{_mandir}/man8/nfsidmap.8*
+%{_mandir}/man8/rpc.idmapd.8*
+%{_mandir}/man8/rpc.sm-notify.8*
+%{_mandir}/man8/rpc.statd.8*
+%{_mandir}/man8/sm-notify.8*
+%{_mandir}/man8/statd.8*
+
+%files -n libnfsidmap
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/idmapd.conf
+%attr(755,root,root) /%{_lib}/libnfsidmap.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libnfsidmap.so.1
+%dir /%{_lib}/libnfsidmap
+%attr(755,root,root) /%{_lib}/libnfsidmap/nsswitch.so
+%attr(755,root,root) /%{_lib}/libnfsidmap/static.so
+# -plugin-ldap subpackage?
+%attr(755,root,root) /%{_lib}/libnfsidmap/umich_ldap.so
+# -plugin-gums subpackage (BR: some datagrid software - VOMS?)
+#%attr(755,root,root) /%{_lib}/libnfsidmap/gums.so
+%{_mandir}/man5/idmapd.conf.5*
+
+%files -n libnfsidmap-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnfsidmap.so
+%{_includedir}/nfsidmap.h
+%{_includedir}/nfsidmap_plugin.h
+%{_pkgconfigdir}/libnfsidmap.pc
+%{_mandir}/man3/nfs4_uid_to_name.3*
+
+%files -n libnfsidmap-static
+%defattr(644,root,root,755)
+%{_libdir}/libnfsidmap.a