Accepting request 343285 from home:posophe:branches:Base:System
some improvements OBS-URL: https://build.opensuse.org/request/show/343285 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=150
This commit is contained in:
Git OBS Bridge
parent
4953e33d48
commit
ae7db45d3d
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 9 23:53:43 UTC 2015 - p.drouand@gmail.com
|
||||
|
||||
- Remove sysvinit related macros; the package doesn't contain any
|
||||
sysvinit script
|
||||
- Replace systemd with systemd-rpm-macros; increase dependencies
|
||||
weight
|
||||
- Use %configure macro
|
||||
- Remove depreciated %clean section
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 27 13:24:31 UTC 2015 - jeffm@suse.com
|
||||
|
||||
|
||||
@ -31,12 +31,8 @@ BuildRequires: nfsidmap-devel >= 0.24
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: sqlite3-devel
|
||||
BuildRequires: tcpd-devel
|
||||
%if 0%{?suse_version} >= 1210
|
||||
BuildRequires: systemd
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1310
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: fedfs-utils-devel
|
||||
%endif
|
||||
Url: http://kernel.org/pub/linux/utils/nfs-utils/
|
||||
Summary: Support Utilities for Kernel nfsd
|
||||
License: GPL-2.0+
|
||||
@ -121,8 +117,9 @@ cp %{S:6} .
|
||||
|
||||
%build
|
||||
rm -f configure; autoreconf -fi
|
||||
CFLAGS="$RPM_OPT_FLAGS -fPIE -fno-strict-aliasing" LDFLAGS="-pie" ./configure \
|
||||
--mandir=%{_mandir} \
|
||||
export CFLAGS="%{optflags} -fPIE"
|
||||
export LDFLAGS="-pie"
|
||||
%{configure} \
|
||||
--with-systemd \
|
||||
--enable-nfsv4 \
|
||||
--enable-gss \
|
||||
@ -181,9 +178,6 @@ install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf
|
||||
# hack to avoid automatic python dependency
|
||||
chmod 644 $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsiostat}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%pre -n nfs-client
|
||||
useradd -r -c 'NFS statd daemon' \
|
||||
-s /sbin/nologin -d /var/lib/nfs -g nogroup statd > /dev/null 2>&1 || :
|
||||
@ -209,11 +203,9 @@ fi
|
||||
%service_add_post nfs
|
||||
|
||||
%preun -n nfs-client
|
||||
%stop_on_removal nfs
|
||||
%service_del_preun nfs
|
||||
|
||||
%postun -n nfs-client
|
||||
%restart_on_update nfs
|
||||
%service_del_postun nfs
|
||||
|
||||
%verifyscript -n nfs-client
|
||||
@ -223,7 +215,6 @@ fi
|
||||
%service_add_pre nfsserver
|
||||
|
||||
%preun -n nfs-kernel-server
|
||||
%stop_on_removal nfsserver
|
||||
%service_del_preun nfsserver
|
||||
|
||||
%post -n nfs-kernel-server
|
||||
@ -239,7 +230,6 @@ fi
|
||||
%service_add_post nfsserver
|
||||
|
||||
%postun -n nfs-kernel-server
|
||||
%restart_on_update nfsserver
|
||||
%service_del_postun nfsserver
|
||||
|
||||
%files -n nfs-client
|
||||
@ -251,20 +241,20 @@ fi
|
||||
/sbin/umount.nfs
|
||||
/sbin/umount.nfs4
|
||||
/sbin/osd_login
|
||||
%attr(0755,root,root) /usr/sbin/mountstats
|
||||
%attr(0755,root,root) /usr/sbin/nfsiostat
|
||||
/usr/sbin/nfsidmap
|
||||
/usr/sbin/nfsstat
|
||||
/usr/sbin/rcnfs
|
||||
/usr/sbin/rcnfs-client
|
||||
/usr/sbin/rpc.gssd
|
||||
/usr/sbin/rpc.idmapd
|
||||
/usr/sbin/rpc.statd
|
||||
/usr/sbin/rpcdebug
|
||||
/usr/sbin/showmount
|
||||
/usr/sbin/sm-notify
|
||||
/usr/sbin/start-statd
|
||||
/usr/sbin/blkmapd
|
||||
%attr(0755,root,root) %{_sbindir}/mountstats
|
||||
%attr(0755,root,root) %{_sbindir}/nfsiostat
|
||||
%{_sbindir}/nfsidmap
|
||||
%{_sbindir}/nfsstat
|
||||
%{_sbindir}/rcnfs
|
||||
%{_sbindir}/rcnfs-client
|
||||
%{_sbindir}/rpc.gssd
|
||||
%{_sbindir}/rpc.idmapd
|
||||
%{_sbindir}/rpc.statd
|
||||
%{_sbindir}/rpcdebug
|
||||
%{_sbindir}/showmount
|
||||
%{_sbindir}/sm-notify
|
||||
%{_sbindir}/start-statd
|
||||
%{_sbindir}/blkmapd
|
||||
%{_unitdir}/auth-rpcgss-module.service
|
||||
%{_unitdir}/nfs-blkmap.service
|
||||
%{_unitdir}/nfs-client.target
|
||||
@ -281,8 +271,8 @@ fi
|
||||
%{_unitdir}/nfs-client.target.d/nfs.conf
|
||||
%dir %{_unitdir}/nfs-config.service.d
|
||||
%{_unitdir}/nfs-config.service.d/restart.conf
|
||||
%dir /usr/lib/systemd/scripts
|
||||
/usr/lib/systemd/scripts/nfs-utils_env.sh
|
||||
%dir %{_libexecdir}/systemd/scripts
|
||||
%{_libexecdir}/systemd/scripts/nfs-utils_env.sh
|
||||
%{_mandir}/man5/nfsmount.conf.5.gz
|
||||
%{_mandir}/man5/nfs.5.gz
|
||||
%{_mandir}/man8/mount.nfs.8.gz
|
||||
@ -320,12 +310,12 @@ fi
|
||||
%{_unitdir}/nfsserver.service
|
||||
%dir %{_unitdir}/nfs-server.service.d
|
||||
%{_unitdir}/nfs-server.service.d/nfsserver.conf
|
||||
/usr/sbin/exportfs
|
||||
/usr/sbin/rcnfsserver
|
||||
/usr/sbin/rcnfs-server
|
||||
/usr/sbin/rpc.mountd
|
||||
/usr/sbin/rpc.nfsd
|
||||
/usr/sbin/rpc.svcgssd
|
||||
%{_sbindir}/exportfs
|
||||
%{_sbindir}/rcnfsserver
|
||||
%{_sbindir}/rcnfs-server
|
||||
%{_sbindir}/rpc.mountd
|
||||
%{_sbindir}/rpc.nfsd
|
||||
%{_sbindir}/rpc.svcgssd
|
||||
/sbin/nfsdcltrack
|
||||
%{_mandir}/man5/exports.5.gz
|
||||
%{_mandir}/man7/nfsd.7.gz
|
||||
@ -336,7 +326,7 @@ fi
|
||||
%{_mandir}/man8/rpc.nfsd.8.gz
|
||||
%{_mandir}/man8/rpc.svcgssd.8.gz
|
||||
%{_mandir}/man8/nfsdcltrack.8.gz
|
||||
/usr/share/omc/svcinfo.d/nfs-kernel-server.xml
|
||||
%{_datadir}/omc/svcinfo.d/nfs-kernel-server.xml
|
||||
%config(noreplace) /var/lib/nfs/xtab
|
||||
%config(noreplace) /var/lib/nfs/etab
|
||||
%config(noreplace) /var/lib/nfs/rmtab
|
||||
|
||||
Loading…
Reference in New Issue
Block a user