diff --git a/nfs-kernel-server.xml b/nfs-kernel-server.xml deleted file mode 100644 index 90a7936..0000000 --- a/nfs-kernel-server.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - NFS Server - - - - Network File Systems (NFS) Server - - - - - /usr/sbin/rcnfsserver start - - - /usr/sbin/rcnfsserver restart - - - /usr/sbin/rcnfsserver stop - - - /usr/sbin/rcnfsserver status - - - - nfsd - nfsd - - - - - network - named - portmap - - - - diff --git a/nfs-utils.changes b/nfs-utils.changes index 65d097b..f5f3d04 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Aug 8 08:39:54 UTC 2016 - tchvatal@suse.com + +- Drop OMC svcinfo file, nowdays useless + +------------------------------------------------------------------- +Mon Aug 8 08:38:16 UTC 2016 - tchvatal@suse.com + +- Sort a bit with spec-cleaner to get uptodate spec +- Convert deps from regular devels to pkgconfig style + ------------------------------------------------------------------- Tue May 24 22:27:14 UTC 2016 - nfbrown@suse.com diff --git a/nfs-utils.spec b/nfs-utils.spec index 5269d83..cf02e5e 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -17,36 +17,17 @@ Name: nfs-utils -BuildRequires: device-mapper-devel -BuildRequires: e2fsprogs-devel -BuildRequires: fedfs-utils-devel -BuildRequires: gcc-c++ -BuildRequires: krb5-devel -BuildRequires: libevent-devel -BuildRequires: libmount-devel -BuildRequires: libtirpc-devel -BuildRequires: libtool -BuildRequires: nfsidmap-devel >= 0.24 -BuildRequires: pkgconfig -BuildRequires: sqlite3-devel -BuildRequires: systemd-rpm-macros -BuildRequires: tcpd-devel -Url: http://kernel.org/pub/linux/utils/nfs-utils/ +Version: 1.3.3 +Release: 0 Summary: Support Utilities for Kernel nfsd License: GPL-2.0+ Group: Productivity/Networking/NFS -Version: 1.3.3 -Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %fillup_prereq -%{?systemd_requires} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://kernel.org/pub/linux/utils/nfs-utils/ Source0: http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz # Download does not work: # Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2 Source1: nfs.doc.tar.bz2 Source4: sysconfig.nfs -Source5: nfs-kernel-server.xml Source6: README.NFSv4 Source7: fw-client Source8: fw-server @@ -68,8 +49,24 @@ Patch6: 0001-mount.nfs-trust-the-exit-status-of-start_statd.patch Patch7: 0001-mount-run-START_STATD-fully-as-root.patch Patch8: 0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch Patch9: 0002-systemd-unit-files-fix-up-dependencies-on-rpcbind.patch - +BuildRequires: e2fsprogs-devel +BuildRequires: fedfs-utils-devel +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: systemd-rpm-macros +BuildRequires: tcpd-devel +BuildRequires: pkgconfig(devmapper) +BuildRequires: pkgconfig(kdb) +BuildRequires: pkgconfig(krb5) +BuildRequires: pkgconfig(libevent) +BuildRequires: pkgconfig(libnfsidmap) >= 0.24 +BuildRequires: pkgconfig(libtirpc) +BuildRequires: pkgconfig(mount) +BuildRequires: pkgconfig(sqlite3) Suggests: python-base +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} %description This package contains the NFS utilities. You can tune the number of @@ -79,12 +76,12 @@ quota over NFS support, install the quota package. %package -n nfs-client Summary: Support Utilities for NFS Group: Productivity/Networking/NFS -Obsoletes: nfs-utils < 1.1.0 Requires: keyutils Requires: netcfg Requires: rpcbind -PreReq: %fillup_prereq -PreReq: permissions +Requires(post): %fillup_prereq +Requires(pre): permissions +Obsoletes: nfs-utils < 1.1.0 %description -n nfs-client This package contains common NFS utilities which are needed for client @@ -93,13 +90,12 @@ and kernel based server. %package -n nfs-kernel-server Summary: Support Utilities for Kernel nfsd Group: Productivity/Networking/NFS -Provides: nfs-utils = %{version} -Obsoletes: nfs-utils < 1.1.0 -Conflicts: nfs-server Requires: netcfg Requires: nfs-client = %{version} Requires: rpcbind -PreReq: %fillup_prereq +Conflicts: nfs-server +Provides: nfs-utils = %{version} +Obsoletes: nfs-utils < 1.1.0 %description -n nfs-kernel-server This package contains support for the kernel based NFS server. You can @@ -110,14 +106,14 @@ package. %package -n nfs-doc Summary: Support Utilities for NFS Group: Productivity/Networking/NFS -Obsoletes: nfs-utils < 1.1.0 Requires: latex2html-pngicons +Obsoletes: nfs-utils < 1.1.0 %description -n nfs-doc This package contains additional NFS documentation. %prep -%setup -q -n nfs-utils-%{version} -a 1 +%setup -q -a 1 %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -129,13 +125,13 @@ This package contains additional NFS documentation. %patch8 -p1 %patch9 -p1 -cp %{S:6} . +cp %{SOURCE6} . %build -rm -f configure; autoreconf -fi +autoreconf -fvi export CFLAGS="%{optflags} -fPIE" export LDFLAGS="-pie" -%{configure} \ +%configure \ --with-systemd \ --enable-nfsv4 \ --enable-gss \ @@ -145,72 +141,70 @@ export LDFLAGS="-pie" --enable-mount \ --enable-libmount-mount \ --enable-mountconfig -make +make %{?_smp_mflags} cd nfs for i in *.html ; do sed -i \ - -e "s@/usr/lib/latex2html/icons.png/next_motif.png@/usr/share/latex2html/icons/next.png@" \ - -e "s@/usr/lib/latex2html/icons.png/up_motif_gr.png@/usr/share/latex2html/icons/up.png@" \ - -e "s@/usr/lib/latex2html/icons.png/previous_motif_gr.png@/usr/share/latex2html/icons/prev.png@" \ + -e "s@%{_prefix}/lib/latex2html/icons.png/next_motif.png@%{_datadir}/latex2html/icons/next.png@" \ + -e "s@%{_prefix}/lib/latex2html/icons.png/up_motif_gr.png@%{_datadir}/latex2html/icons/up.png@" \ + -e "s@%{_prefix}/lib/latex2html/icons.png/previous_motif_gr.png@%{_datadir}/latex2html/icons/prev.png@" \ $i done %install -make install DESTDIR=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/%{_unitdir} -install -m 644 %{S:15} $RPM_BUILD_ROOT%{_unitdir}/nfsserver.service -install -m 644 %{S:16} $RPM_BUILD_ROOT%{_unitdir}/nfs.service -install -d $RPM_BUILD_ROOT%{_unitdir}/nfs-server.service.d -install -m 644 %{S:17} $RPM_BUILD_ROOT%{_unitdir}/nfs-server.service.d/nfsserver.conf -install -d $RPM_BUILD_ROOT%{_unitdir}/nfs-client.target.d -install -m 644 %{S:18} $RPM_BUILD_ROOT%{_unitdir}/nfs-client.target.d/nfs.conf -install -d $RPM_BUILD_ROOT/usr/lib/systemd/scripts -install -m 755 %{S:14} $RPM_BUILD_ROOT/usr/lib/systemd/scripts/nfs-utils_env.sh -install -d $RPM_BUILD_ROOT%{_unitdir}/nfs-config.service.d -install -m 644 %{S:12} $RPM_BUILD_ROOT%{_unitdir}/nfs-config.service.d/restart.conf -ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfsserver -ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs-server -ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs -ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcnfs-client +make %{?_smp_mflags} DESTDIR=%{buildroot} install +install -d %{buildroot}/%{_unitdir} +install -m 644 %{SOURCE15} %{buildroot}%{_unitdir}/nfsserver.service +install -m 644 %{SOURCE16} %{buildroot}%{_unitdir}/nfs.service +install -d %{buildroot}%{_unitdir}/nfs-server.service.d +install -m 644 %{SOURCE17} %{buildroot}%{_unitdir}/nfs-server.service.d/nfsserver.conf +install -d %{buildroot}%{_unitdir}/nfs-client.target.d +install -m 644 %{SOURCE18} %{buildroot}%{_unitdir}/nfs-client.target.d/nfs.conf +install -d %{buildroot}%{_prefix}/lib/systemd/scripts +install -m 755 %{SOURCE14} %{buildroot}%{_prefix}/lib/systemd/scripts/nfs-utils_env.sh +install -d %{buildroot}%{_unitdir}/nfs-config.service.d +install -m 644 %{SOURCE12} %{buildroot}%{_unitdir}/nfs-config.service.d/restart.conf +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfsserver +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-server +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcnfs-client # sysconfig-data -mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/var/adm/fillup-templates +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +install -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates # idmapd setup -install -d $RPM_BUILD_ROOT/etc -install -m 644 %{S:11} $RPM_BUILD_ROOT/etc/idmapd.conf -mkdir -p -m 755 $RPM_BUILD_ROOT/var/lib/nfs/rpc_pipefs -mkdir -p -m 755 $RPM_BUILD_ROOT/var/lib/nfs/v4recovery -mkdir -p -m 755 $RPM_BUILD_ROOT/usr/share/omc/svcinfo.d -install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/share/omc/svcinfo.d +install -d %{buildroot}/etc +install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/idmapd.conf +mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/nfs/rpc_pipefs +mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/nfs/v4recovery # sm-notify state -mkdir -p -m 755 $RPM_BUILD_ROOT/var/lib/nfs/sm -mkdir -p -m 755 $RPM_BUILD_ROOT/var/lib/nfs/sm.bak -touch $RPM_BUILD_ROOT/var/lib/nfs/state -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services -install -m 0644 %{SOURCE7} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-client -install -m 0644 %{SOURCE8} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server -install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf +mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/nfs/sm +mkdir -p -m 755 %{buildroot}%{_localstatedir}/lib/nfs/sm.bak +touch %{buildroot}%{_localstatedir}/lib/nfs/state +mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services +install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nfs-client +install -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server +install -m 644 utils/mount/nfsmount.conf %{buildroot}%{_sysconfdir}/nfsmount.conf # # hack to avoid automatic python dependency -chmod 644 $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsiostat} +chmod 644 %{buildroot}%{_sbindir}/{mountstats,nfsiostat} %pre -n nfs-client useradd -r -c 'NFS statd daemon' \ - -s /sbin/nologin -d /var/lib/nfs -g nogroup statd > /dev/null 2>&1 || : + -s /sbin/nologin -d %{_localstatedir}/lib/nfs -g nogroup statd > /dev/null 2>&1 || : %service_add_pre nfs %post -n nfs-client -chown statd:nogroup /var/lib/nfs +chown statd:nogroup %{_localstatedir}/lib/nfs for i in state sm sm.bak; do - chown -R statd /var/lib/nfs/$i > /dev/null 2>&1 || : + chown -R statd %{_localstatedir}/lib/nfs/$i > /dev/null 2>&1 || : done ### migrate from /var/lock/subsys [ -d /run/nfs ] || mkdir /run/nfs -if [ -f /var/lock/subsys/nfs-rpc.idmapd ]; then - mv /var/lock/subsys/nfs-rpc.idmapd /run/nfs +if [ -f %{_localstatedir}/lock/subsys/nfs-rpc.idmapd ]; then + mv %{_localstatedir}/lock/subsys/nfs-rpc.idmapd /run/nfs fi -if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then - mv /var/lock/subsys/nfsserver-rpc.idmapd /run/nfs +if [ -f %{_localstatedir}/lock/subsys/nfsserver-rpc.idmapd ]; then + mv %{_localstatedir}/lock/subsys/nfsserver-rpc.idmapd /run/nfs fi ### %{fillup_only -n nfs nfs} @@ -236,11 +230,11 @@ fi %post -n nfs-kernel-server ### migrate from /var/lock/subsys [ -d /run/nfs ] || mkdir /run/nfs -if [ -f /var/lock/subsys/nfs-rpc.idmapd ]; then - mv /var/lock/subsys/nfs-rpc.idmapd /run/nfs +if [ -f %{_localstatedir}/lock/subsys/nfs-rpc.idmapd ]; then + mv %{_localstatedir}/lock/subsys/nfs-rpc.idmapd /run/nfs fi -if [ -f /var/lock/subsys/nfsserver-rpc.idmapd ]; then - mv /var/lock/subsys/nfsserver-rpc.idmapd /run/nfs +if [ -f %{_localstatedir}/lock/subsys/nfsserver-rpc.idmapd ]; then + mv %{_localstatedir}/lock/subsys/nfsserver-rpc.idmapd /run/nfs fi ### %service_add_post nfsserver @@ -250,8 +244,8 @@ fi %files -n nfs-client %defattr(-,root,root) -%config /etc/idmapd.conf -%config /etc/nfsmount.conf +%config %{_sysconfdir}/idmapd.conf +%config %{_sysconfdir}/nfsmount.conf %verify(not mode) %attr(0755,root,root) /sbin/mount.nfs /sbin/mount.nfs4 /sbin/umount.nfs @@ -289,34 +283,34 @@ fi %{_unitdir}/nfs-config.service.d/restart.conf %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 -%{_mandir}/man8/nfsidmap.8.gz -%{_mandir}/man8/nfsstat.8.gz -%{_mandir}/man8/rpc.sm-notify.8.gz -%{_mandir}/man8/showmount.8.gz -%{_mandir}/man8/sm-notify.8.gz -%{_mandir}/man8/umount.nfs.8.gz -%{_mandir}/man8/rpc.gssd.8.gz -%{_mandir}/man8/rpc.idmapd.8.gz -%{_mandir}/man8/gssd.8.gz -%{_mandir}/man8/idmapd.8.gz -%{_mandir}/man8/svcgssd.8.gz -%{_mandir}/man8/rpc.statd.8.gz -%{_mandir}/man8/rpcdebug.8.gz -%{_mandir}/man8/statd.8.gz -%{_mandir}/man8/mountstats.8.gz -%{_mandir}/man8/nfsiostat.8.gz -%{_mandir}/man8/blkmapd.8.gz -/var/adm/fillup-templates/sysconfig.nfs -%attr(0711,statd,nogroup) %dir /var/lib/nfs -%dir /var/lib/nfs/rpc_pipefs -%dir /var/lib/nfs/v4recovery -%attr(0700,statd,nogroup) %dir /var/lib/nfs/sm -%attr(0700,statd,nogroup) %dir /var/lib/nfs/sm.bak -%attr(0700,statd,nogroup) %ghost /var/lib/nfs/state -%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/nfs-client +%{_mandir}/man5/nfsmount.conf.5%{ext_man} +%{_mandir}/man5/nfs.5%{ext_man} +%{_mandir}/man8/mount.nfs.8%{ext_man} +%{_mandir}/man8/nfsidmap.8%{ext_man} +%{_mandir}/man8/nfsstat.8%{ext_man} +%{_mandir}/man8/rpc.sm-notify.8%{ext_man} +%{_mandir}/man8/showmount.8%{ext_man} +%{_mandir}/man8/sm-notify.8%{ext_man} +%{_mandir}/man8/umount.nfs.8%{ext_man} +%{_mandir}/man8/rpc.gssd.8%{ext_man} +%{_mandir}/man8/rpc.idmapd.8%{ext_man} +%{_mandir}/man8/gssd.8%{ext_man} +%{_mandir}/man8/idmapd.8%{ext_man} +%{_mandir}/man8/svcgssd.8%{ext_man} +%{_mandir}/man8/rpc.statd.8%{ext_man} +%{_mandir}/man8/rpcdebug.8%{ext_man} +%{_mandir}/man8/statd.8%{ext_man} +%{_mandir}/man8/mountstats.8%{ext_man} +%{_mandir}/man8/nfsiostat.8%{ext_man} +%{_mandir}/man8/blkmapd.8%{ext_man} +%{_localstatedir}/adm/fillup-templates/sysconfig.nfs +%attr(0711,statd,nogroup) %dir %{_localstatedir}/lib/nfs +%dir %{_localstatedir}/lib/nfs/rpc_pipefs +%dir %{_localstatedir}/lib/nfs/v4recovery +%attr(0700,statd,nogroup) %dir %{_localstatedir}/lib/nfs/sm +%attr(0700,statd,nogroup) %dir %{_localstatedir}/lib/nfs/sm.bak +%attr(0700,statd,nogroup) %ghost %{_localstatedir}/lib/nfs/state +%config %attr(0644,root,root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nfs-client %files -n nfs-kernel-server %defattr(-,root,root) @@ -333,20 +327,19 @@ fi %{_sbindir}/rpc.nfsd %{_sbindir}/rpc.svcgssd /sbin/nfsdcltrack -%{_mandir}/man5/exports.5.gz -%{_mandir}/man7/nfsd.7.gz -%{_mandir}/man8/exportfs.8.gz -%{_mandir}/man8/mountd.8.gz -%{_mandir}/man8/nfsd.8.gz -%{_mandir}/man8/rpc.mountd.8.gz -%{_mandir}/man8/rpc.nfsd.8.gz -%{_mandir}/man8/rpc.svcgssd.8.gz -%{_mandir}/man8/nfsdcltrack.8.gz -%{_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 -%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server +%{_mandir}/man5/exports.5%{ext_man} +%{_mandir}/man7/nfsd.7%{ext_man} +%{_mandir}/man8/exportfs.8%{ext_man} +%{_mandir}/man8/mountd.8%{ext_man} +%{_mandir}/man8/nfsd.8%{ext_man} +%{_mandir}/man8/rpc.mountd.8%{ext_man} +%{_mandir}/man8/rpc.nfsd.8%{ext_man} +%{_mandir}/man8/rpc.svcgssd.8%{ext_man} +%{_mandir}/man8/nfsdcltrack.8%{ext_man} +%config(noreplace) %{_localstatedir}/lib/nfs/xtab +%config(noreplace) %{_localstatedir}/lib/nfs/etab +%config(noreplace) %{_localstatedir}/lib/nfs/rmtab +%config %attr(0644,root,root) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server %files -n nfs-doc %defattr(-,root,root)