- rel 4

[packages/nfs-utils.git] / nfs-utils.spec

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 98445e7c93825b4fb9ed59d6bac9af7a3b2b3a63..383a5b1dc851d754054468846a876cb5efafb4da 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,10 +1,7 @@
-# TODO
-# - should unmount /proc/fs/nfsd and /var/lib/nfs/rpc_pipefs at package
-#      uninstall (or in service nfs stop)

 #
 # Conditional build:
 #
 # Conditional build:

-%bcond_without nfs4            # without NFSv4 support
-%bcond_without mount           # don't build mount.nfs program
+%bcond_with    krb5            # build with MIT Kerberos (+libgssglue) 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:       Kernel NFS server
 Summary(pl.UTF-8):     Działający na poziomie jądra serwer NFS


@@ -12,12 +9,13 @@ 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
 Summary(ru.UTF-8):     Утилиты для NFS и демоны поддержки для NFS-сервера ядра
 Summary(uk.UTF-8):     Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:          nfs-utils

-Version:       1.1.3
-Release:       2
+Version:       1.2.5
+Release:       4

 License:       GPL v2
 Group:         Networking/Daemons
 License:       GPL v2
 Group:         Networking/Daemons

-Source0:       ftp://ftp.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.gz
-# Source0-md5: 167d231850b00c7c63300747aeb94c38
+#Source0:      http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
+Source0:       http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2
+# Source0-md5: 8395ac770720b83c5c469f88306d7765

 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da


@@ -30,43 +28,69 @@ Source7:    rpcsvcgssd.init
 Source8:       nfs.sysconfig
 Source9:       nfslock.sysconfig
 Source10:      nfsfs.sysconfig
 Source8:       nfs.sysconfig
 Source9:       nfslock.sysconfig
 Source10:      nfsfs.sysconfig

-Patch0:                %{name}-eepro-support.patch
-Patch1:                %{name}-install.patch
-Patch2:                %{name}-statdpath.patch
-Patch3:                %{name}-mountd.patch
-Patch4:                %{name}-idmapd.conf.patch
-Patch5:                %{name}-keytab-path.patch
-Patch6:                %{name}-subsys.patch
+Source11:      blkmapd.init
+Source100:     proc-fs-nfsd.mount
+Source101:     var-lib-nfs-rpc_pipefs.mount
+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}-heimdal.patch
+Patch5:                %{name}-heimdal-kcm.patch

 URL:           http://nfs.sourceforge.net/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: cpp
 URL:           http://nfs.sourceforge.net/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: cpp

-BuildRequires: e2fsprogs-devel >= 1.39-5
-%if %{with nfs4}
-BuildRequires: krb5-devel >= 1.6
+BuildRequires: keyutils-devel
+BuildRequires: libblkid-devel >= 1.40
+BuildRequires: libmount-devel
+BuildRequires: libcap-devel
+BuildRequires: device-mapper-devel

 BuildRequires: libevent-devel >= 1.2
 BuildRequires: libevent-devel >= 1.2

-BuildRequires: libgssglue-devel >= 0.1
-BuildRequires: libnfsidmap-devel
-BuildRequires: librpcsecgss-devel >= 0.16
-%endif
+BuildRequires: libnfsidmap-devel >= 0.24

 BuildRequires: libtool
 BuildRequires: libwrap-devel
 BuildRequires: pkgconfig
 BuildRequires: libtool
 BuildRequires: libwrap-devel
 BuildRequires: pkgconfig

-BuildRequires: sed >= 4.0
+BuildRequires: rpm-pythonprov
+%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.3
+%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:      %{name}-common = %{version}-%{release}
 # 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:      %{name}-common = %{version}-%{release}

-Requires:      portmap >= 4.0
+Requires:      libevent >= 2.0.14-2

 Requires:      rc-scripts >= 0.4.1.5
 Requires:      rc-scripts >= 0.4.1.5

+Requires:      rpcbind >= 0.1.7

 Requires:      setup >= 2.4.6-7
 Provides:      nfsdaemon
 Obsoletes:     knfsd
 Obsoletes:     nfs-server
 Obsoletes:     nfsdaemon
 Conflicts:     kernel < 2.2.5
 Requires:      setup >= 2.4.6-7
 Provides:      nfsdaemon
 Obsoletes:     knfsd
 Obsoletes:     nfs-server
 Obsoletes:     nfsdaemon
 Conflicts:     kernel < 2.2.5

+Conflicts:     krb5-common < 1.7

 ExcludeArch:   armv4l
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 ExcludeArch:   armv4l
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -95,6 +119,20 @@ do Linux.
 супутні утиліти, які забезпечують набагато більшу продуктивність, ніж
 традиційні Linux NFS-сервери, які використовує більшість користувачів.
 
 супутні утиліти, які забезпечують набагато більшу продуктивність, ніж
 традиційні Linux NFS-сервери, які використовує більшість користувачів.
 

+%package systemd
+Summary:       systemd units for NFS server services
+Summary(pl.UTF-8):     Jednostki systemd dla serwisów serwera NFS
+Group:         Daemons
+Requires:      %{name} = %{version}-%{release}
+Requires:      systemd
+Requires:      systemd-units
+
+%description systemd
+Systemd units for NFS server services.
+
+%description systemd -l pl.UTF-8
+Jednostki systemd dla serwisów serwera NFS.
+

 %package clients
 Summary:       Clients for connecting to a remote NFS server
 Summary(pl.UTF-8):     Klienci do łączenia się ze zdalnym serwerem NFS
 %package clients
 Summary:       Clients for connecting to a remote NFS server
 Summary(pl.UTF-8):     Klienci do łączenia się ze zdalnym serwerem NFS


@@ -108,6 +146,7 @@ Provides:   nfsclient
 Obsoletes:     knfsd-clients
 Obsoletes:     nfs-server-clients
 Obsoletes:     nfsclient
 Obsoletes:     knfsd-clients
 Obsoletes:     nfs-server-clients
 Obsoletes:     nfsclient

+Conflicts:     krb5-common < 1.7

 
 %description clients
 The nfs-server-clients package contains the showmount program.
 
 %description clients
 The nfs-server-clients package contains the showmount program.


@@ -123,31 +162,36 @@ 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.
 
 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)
-Group:         Networking
-Requires(post,preun):  /sbin/chkconfig
-Requires:      portmap >= 4.0
-Requires:      rc-scripts
-Provides:      group(rpcstatd)
-Provides:      user(rpcstatd)
-Provides:      nfslockd
-Obsoletes:     knfsd-lock
-Obsoletes:     nfslockd
+%package clients-systemd
+Summary:       systemd units for NFS clients
+Summary(pl.UTF-8):     Jednostki systemd dla klientów NFS
+Group:         Daemons
+Requires:      %{name}-clients = %{version}-%{release}
+Requires:      systemd
+Requires:      systemd-units

 
 

-%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 clients-systemd
+Systemd units for NFS clients.

 
 

-%description lock -l pl.UTF-8
-Ten pakiet zawiera programy umożliwiające wykonywanie blokowania
-plików (file locking) poprzez NFS.
+%description clients-systemd -l pl.UTF-8
+Jednostki systemd dla klientów NFS.

 
 %package common
 Summary:       Common programs for NFS
 Summary(pl.UTF-8):     Wspólne programy do obsługi NFS
 Group:         Networking
 
 %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
+Provides:      user(rpcstatd)
+Provides:      group(rpcstatd)
+Provides:      nfslockd
+Provides:      nfs-utils-lock
+Requires:      libnfsidmap >= 0.25-3
+Requires:      rc-scripts
+Requires:      rpcbind >= 0.1.7
+Obsoletes:     nfs-utils-lock
+Obsoletes:     knfsd-lock
+Obsoletes:     nfslockd
+Conflicts:     mount < 2.13-0.pre7.1

 
 %description common
 Common programs for NFS.
 
 %description common
 Common programs for NFS.


@@ -155,6 +199,20 @@ Common programs for NFS.
 %description common -l pl.UTF-8
 Wspólne programy do obsługi NFS.
 
 %description common -l pl.UTF-8
 Wspólne programy do obsługi NFS.
 

+%package common-systemd
+Summary:       systemd units for common NFS services
+Summary(pl.UTF-8):     Jednostki systemd dla wspólnych serwisów NFS
+Group:         Daemons
+Requires:      %{name}-common = %{version}-%{release}
+Requires:      systemd
+Requires:      systemd-units
+
+%description common-systemd
+Systemd units for common NFS services.
+
+%description common-systemd -l pl.UTF-8
+Jednostki systemd dla wspólnych serwisów NFS.
+

 %prep
 %setup -q -a1
 %patch0 -p1
 %prep
 %setup -q -a1
 %patch0 -p1


@@ -163,10 +221,6 @@ Wspólne programy do obsługi NFS.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1

-%patch6 -p1
-
-# conflict with GNU stdio extension
-sed -i -e 's/dprintf/dbgprintf/' support/include/ha-callout.h utils/statd/*.[ch]

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}


@@ -175,43 +229,54 @@ sed -i -e 's/dprintf/dbgprintf/' support/include/ha-callout.h utils/statd/*.[ch]
 %{__autoheader}
 %{__automake}
 %configure \
 %{__autoheader}
 %{__automake}
 %configure \

-%if %{with nfs4}
-       --enable-gss \
-       --with-krb5=%{_prefix} \
+       --enable-nfsv3 \

        --enable-nfsv4 \
        --enable-nfsv4 \

+       --enable-nfsv41 \
+       --enable-gss \
+       --enable-mount \
+       --enable-mountconfig \
+       --enable-libmount-mount \
+%if %{with tirpc}
+       --enable-tirpc \
+       --enable-ipv6 \

 %else
 %else

-       --disable-gss \
-       --disable-nfsv4 \
+       --disable-tirpc \
+       --disable-ipv6 \

 %endif
 %endif

-       %{?with_mount:--enable-mount} \
-       --enable-nfsv3 \
-       --enable-secure-statd \
+       --with-statdpath=/var/lib/nfs/statd \

        --with-statedir=/var/lib/nfs \
        --with-statedir=/var/lib/nfs \

-       --with-tcp-wrappers
+       --with-statduser=rpcstatd \
+       --with-start-statd=/sbin/start-statd \
+       --with-tcp-wrappers \
+       --with-krb5

 
 %{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{/sbin,%{_sbindir},%{_mandir}/man{5,8}} \
-       $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig} \
-       $RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery,statd}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig,exports.d} \
+       $RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery} \
+       $RPM_BUILD_ROOT{%{systemdunitdir},%{_datadir}/nfs-utils}

 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 

-cat >$RPM_BUILD_ROOT%{_sbindir}/start-statd <<EOF
+install -p utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc
+
+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).
 #!/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
 
 EOF
 

-sed -e "s|#!/bin/bash|#!/bin/sh|" utils/gssd/gss_destroy_creds > $RPM_BUILD_ROOT%{_sbindir}/gss_destroy_creds
+%{__sed} -i -e "s|#!/bin/bash|#!/bin/sh|" $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
-install utils/idmapd/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}/
+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
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock


@@ -219,24 +284,36 @@ 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 %{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 %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/nfsd
 install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/nfslock
 install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
 

+install %{SOURCE100} $RPM_BUILD_ROOT%{systemdunitdir}/proc-fs-nfsd.mount
+install %{SOURCE101} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+install %{SOURCE102} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd.service
+install %{SOURCE103} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-blkmapd.service
+install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-exportfs.service
+install %{SOURCE105} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-gssd.service
+install %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-idmapd.service
+install %{SOURCE107} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-lock.service
+install %{SOURCE108} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-mountd.service
+install %{SOURCE109} $RPM_BUILD_ROOT%{systemdunitdir}/nfs-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/nfs-lock.preconfig
+

 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports
 
 > $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.{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
 echo ".so sm-notify.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.sm-notify.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
 echo ".so sm-notify.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.sm-notify.8

-%if %{with nfs4}
-rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{svcgssd,gssd,idmapd}.8

 echo ".so gssd.8"    > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.gssd.8
 echo ".so idmapd.8"  > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.idmapd.8
 echo ".so svcgssd.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.svcgssd.8
 echo ".so gssd.8"    > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.gssd.8
 echo ".so idmapd.8"  > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.idmapd.8
 echo ".so svcgssd.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.svcgssd.8

-%endif

 
 touch $RPM_BUILD_ROOT/var/lib/nfs/xtab
 
 
 touch $RPM_BUILD_ROOT/var/lib/nfs/xtab
 


@@ -250,94 +327,130 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add nfs
 %service nfs restart "NFS daemon"
 %post
 /sbin/chkconfig --add nfs
 %service nfs restart "NFS daemon"

-%if %{with nfs4}

 /sbin/chkconfig --add svcgssd
 %service svcgssd restart "RPC svcgssd"
 /sbin/chkconfig --add svcgssd
 %service svcgssd restart "RPC svcgssd"

-%endif

 
 %preun
 if [ "$1" = "0" ]; then
        %service nfs stop
        /sbin/chkconfig --del nfs
 
 %preun
 if [ "$1" = "0" ]; then
        %service nfs stop
        /sbin/chkconfig --del nfs

-%if %{with nfs4}

        %service svcgssd stop
        /sbin/chkconfig --del svcgssd
        %service svcgssd stop
        /sbin/chkconfig --del svcgssd

-%endif

 fi
 
 fi
 

+%post systemd
+%systemd_post nfsd.service
+%systemd_post nfs-exportfs.service
+%systemd_post nfs-mountd.service
+%systemd_post nfs-svcgssd.service
+
+%preun systemd
+%systemd_preun nfsd.service
+%systemd_preun nfs-exportfs.service
+%systemd_preun nfs-mountd.service
+%systemd_preun nfs-svcgssd.service
+
+%postun systemd
+%systemd_reload
+

 %post clients
 /sbin/chkconfig --add nfsfs
 %service nfsfs restart
 %post clients
 /sbin/chkconfig --add nfsfs
 %service nfsfs restart

-%if %{with nfs4}

 /sbin/chkconfig --add gssd
 %service gssd restart "RPC gssd"
 /sbin/chkconfig --add gssd
 %service gssd restart "RPC gssd"

-%endif
+/sbin/chkconfig --add blkmapd
+%service blkmapd restart "pNFS blkmapd"

 
 %preun clients
 if [ "$1" = "0" ]; then
        %service nfsfs stop
        /sbin/chkconfig --del nfsfs
 
 %preun clients
 if [ "$1" = "0" ]; then
        %service nfsfs stop
        /sbin/chkconfig --del nfsfs

-%if %{with nfs4}

        %service gssd stop
        /sbin/chkconfig --del gssd
        %service gssd stop
        /sbin/chkconfig --del gssd

-%endif
+       %service blkmapd stop
+       /sbin/chkconfig --del blkmapd

 fi
 
 fi
 

-%pre lock
+%post clients-systemd
+%systemd_post nfs-blkmapd.service
+%systemd_post nfs-gssd.service
+
+%preun clients-systemd
+%systemd_preun nfs-blkmapd.service
+%systemd_preun nfs-gssd.service
+
+%postun clients-systemd
+%systemd_reload
+
+%pre common

 %groupadd -g 191 rpcstatd
 %useradd -u 191 -d /var/lib/nfs/statd -s /bin/false -c "RPC statd user" -g rpcstatd rpcstatd
 
 %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"
 
 /sbin/chkconfig --add nfslock
 %service nfslock restart "RPC statd"
 

-%preun lock
+%preun common

 if [ "$1" = "0" ]; then
 if [ "$1" = "0" ]; then

+       %service idmapd stop
+       /sbin/chkconfig --del idmapd

        %service nfslock stop
        /sbin/chkconfig --del nfslock
 fi
 
        %service nfslock stop
        /sbin/chkconfig --del nfslock
 fi
 

-%postun lock
+%postun common

 if [ "$1" = "0" ]; then
        %userremove rpcstatd
        %groupremove rpcstatd
 fi
 
 if [ "$1" = "0" ]; then
        %userremove rpcstatd
        %groupremove rpcstatd
 fi
 

-%if %{with nfs4}
-%post common
-/sbin/chkconfig --add idmapd
-%service idmapd restart "RPC idmapd"
-
-%preun common
-if [ "$1" = "0" ]; then
-       %service idmapd stop
-       /sbin/chkconfig --del idmapd
+%post common-systemd
+%systemd_post nfs-idmapd.service
+%systemd_post nfs-lock.service
+
+%preun common-systemd
+%systemd_preun nfs-idmapd.service
+%systemd_preun nfs-lock.service
+
+%postun common-systemd
+%systemd_reload
+
+%triggerpostun -- %{name} < 1.2.5-4
+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
+       [ -z "$__RPCMOUNTDOPTIONS" ] && exit 0
+       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

-%endif
-
-%triggerpostun -- %{name} < 1.1.0-0.rc1.1
-/sbin/chkconfig nfs reset
-%if %{with nfs4}
-/sbin/chkconfig svcgssd reset
-%endif
-
-%triggerpostun lock -- %{name}-lock < 1.1.0-0.rc1.1
-/sbin/chkconfig nfslock reset

 
 

-%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
 fi

-/sbin/chkconfig nfsfs reset
-%if %{with nfs4}
-/sbin/chkconfig gssd reset
-%endif

 
 

-%if %{with nfs4}
-%triggerpostun common -- %{name}-common < 1.1.0-0.rc1.1
-/sbin/chkconfig idmapd reset
-%endif
+%triggerpostun common -- %{name}-common < 1.2.5-4
+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"
+       [ -z "$STATDOPTS" ] && exit 0
+       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

 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)


@@ -347,11 +460,15 @@ fi
 %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}/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(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
 
 %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) /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


@@ -365,55 +482,83 @@ fi
 %{_mandir}/man8/nfsstat.8*
 %{_mandir}/man8/rpc.mountd.8*
 %{_mandir}/man8/rpc.nfsd.8*
 %{_mandir}/man8/nfsstat.8*
 %{_mandir}/man8/rpc.mountd.8*
 %{_mandir}/man8/rpc.nfsd.8*

+%{_mandir}/man8/rpc.svcgssd.8*

 %{_mandir}/man8/rpcdebug.8*
 %{_mandir}/man8/rpcdebug.8*

-%if %{with nfs4}
-%attr(754,root,root) /etc/rc.d/init.d/svcgssd
-%attr(755,root,root) %{_sbindir}/rpc.svcgssd
-%{_mandir}/man8/*svcgss*
-%endif
+%{_mandir}/man8/svcgssd.8*

 
 

-%files lock
+%files systemd

 %defattr(644,root,root,755)
 %defattr(644,root,root,755)

-%attr(700,rpcstatd,rpcstatd) %dir %{_var}/lib/nfs/statd
-%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*
-%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/state
+%{systemdunitdir}/nfsd.service
+%{systemdunitdir}/nfs-exportfs.service
+%{systemdunitdir}/nfs-mountd.service
+%{systemdunitdir}/nfs-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)
 
 %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(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*
-%if %{with mount}
+%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/mount.nfs

-%attr(4755,root,root) /sbin/mount.nfs4

 %attr(4755,root,root) /sbin/umount.nfs
 %attr(4755,root,root) /sbin/umount.nfs

+%attr(4755,root,root) /sbin/mount.nfs4

 %attr(4755,root,root) /sbin/umount.nfs4
 %attr(4755,root,root) /sbin/umount.nfs4

-%{_mandir}/man8/*mount.nfs.8*
-%endif
-%if %{with nfs4}
-%attr(754,root,root) /etc/rc.d/init.d/gssd
-%attr(755,root,root) %{_sbindir}/rpc.gssd
-%{_mandir}/man8/rpc.gssd*
-%{_mandir}/man8/gssd*
-%endif
+%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*
+
+%files clients-systemd
+%defattr(644,root,root,755)
+%{systemdunitdir}/nfs-blkmapd.service
+%{systemdunitdir}/nfs-gssd.service

 
 %files common
 %defattr(644,root,root,755)
 
 %files common
 %defattr(644,root,root,755)

-%attr(755,root,root) %dir %{_var}/lib/nfs
-%attr(755,root,root) %dir %{_var}/lib/nfs/rpc_pipefs
-%attr(755,root,root) %dir %{_var}/lib/nfs/v4recovery
-%{_mandir}/man5/nfs*
-%if %{with nfs4}
+%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/idmapd

-%attr(755,root,root) %{_sbindir}/gss_*
-%attr(755,root,root) %{_sbindir}/rpc.idmapd
-%attr(660,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/idmapd.conf
-%{_mandir}/man[58]/*idmap*
-%endif
+%attr(754,root,root) /etc/rc.d/init.d/nfslock
+%attr(755,root,root) %{_sbindir}/gss_clnt_send_err
+%attr(755,root,root) %{_sbindir}/gss_destroy_creds
+%attr(755,root,root) %{_sbindir}/sm-notify
+%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
+%dir %{_var}/lib/nfs
+%dir %{_var}/lib/nfs/rpc_pipefs
+%dir %{_var}/lib/nfs/v4recovery
+%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
+%{_mandir}/man5/nfs.5*
+%{_mandir}/man8/idmapd.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 common-systemd
+%defattr(644,root,root,755)
+%{systemdunitdir}/nfs-idmapd.service
+%{systemdunitdir}/nfs-lock.service
+%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+%dir %{_datadir}/nfs-utils
+%attr(755,root,root) %{_datadir}/nfs-utils/nfs-lock.preconfig