- added config generator for upstream systemd services (not used yet)

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

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 1548894929d845c0a625bb2e7ea538e5641a7b84..2d0d8691c42f7de2d4045ad8d691f8143bde3b59 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_with    krb5            # build with MIT Kerberos (+libgssglue) instead of Heimdal
+%bcond_with    krb5            # build with MIT Kerberos instead of Heimdal
 %bcond_without tirpc           # use librpcsecgss instead of libtirpc
 #
 Summary:       Kernel NFS server
@@ -9,13 +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
-Version:       1.2.7
+Version:       1.3.0
 Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
-#Source0:      http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
+#Source0:      https://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
 Source0:       http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2
-# Source0-md5: 3b5ca797197765dc0c3a4122720c7716
+# Source0-md5: 3ac3726eda563946d1f44ac3e5b61d56
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -30,8 +30,7 @@ Source9:      nfslock.sysconfig
 Source10:      nfsfs.sysconfig
 Source11:      blkmapd.init
 Source12:      sunrpc.conf
-Source100:     proc-fs-nfsd.mount
-Source101:     var-lib-nfs-rpc_pipefs.mount
+Source13:      nfs-utils_env.sh
 Source102:     nfsd.service
 Source103:     nfs-blkmapd.service
 Source104:     nfs-exportfs.service
@@ -63,6 +62,7 @@ BuildRequires:        libtool
 BuildRequires: libwrap-devel
 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
+BuildRequires: sqlite3-devel >= 3.3
 %if %{with tirpc}
 BuildRequires: libtirpc-devel >= 1:0.1.10-4
 %else
@@ -70,7 +70,6 @@ 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
@@ -214,6 +213,7 @@ Wspólne programy do obsługi NFS.
        --with-statduser=rpcstatd \
        --with-start-statd=/sbin/start-statd \
        --with-tcp-wrappers \
+       --without-gssglue \
        --with-krb5
 
 %{__make} all
@@ -229,6 +229,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig,exports.d,modpro
 
 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
@@ -237,7 +238,6 @@ cat >$RPM_BUILD_ROOT/sbin/start-statd <<EOF
 exec /sbin/rpc.statd --no-notify
 EOF
 
-%{__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
 
 for f in rpcdebug blkmapd nfsidmap rpc.gssd rpc.idmapd rpc.statd ; do
@@ -257,8 +257,8 @@ install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
 
 install %{SOURCE12} $RPM_BUILD_ROOT/etc/modprobe.d/sunrpc.conf
 
-install %{SOURCE100} $RPM_BUILD_ROOT%{systemdunitdir}/proc-fs-nfsd.mount
-install %{SOURCE101} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+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
 install %{SOURCE102} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd.service
 install %{SOURCE103} $RPM_BUILD_ROOT%{systemdunitdir}/blkmapd.service
 install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-exportfs.service
@@ -409,7 +409,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README html
+%doc README html
 %attr(755,root,root) /sbin/rpcdebug
 %attr(755,root,root) /sbin/fsck.nfs
 %attr(755,root,root) %{_sbindir}/exportfs
@@ -489,8 +489,6 @@ fi
 %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) %{_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