From f77737781e959e47a0108cc78ec9cbba508ac506 Mon Sep 17 00:00:00 2001
From: mgb01105731 <mgb01105731@alibaba-inc.com>
Date: Mon, 24 Oct 2022 15:49:18 +0800
Subject: [PATCH] optimise spec file

---
 nfs-utils.spec | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index be55f93..30da6f2 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,4 +1,4 @@
-%define anolis_release 1
+%define anolis_release 2
 Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
 Name: nfs-utils
 URL: http://linux-nfs.org/
@@ -210,6 +210,11 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/exports.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nfsmount.conf.d
 install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/nfsmount.conf.d
 
+%generate_compatibility_deps
+
+# for checkbuildroot
+sed -e '/BUILDROOT/d' %{buildroot}/%{abidir}/showmount-option.list > %{buildroot}/%{abidir}/showmount-option.list.new
+mv %{buildroot}/%{abidir}/showmount-option.list.new %{buildroot}/%{abidir}/showmount-option.list
 
 %pre
 # move files so the running service will have this applied as well
@@ -346,6 +351,18 @@ fi
 %{_sbindir}/nfsdcld
 %{_sbindir}/nfsdclddb
 %{_sbindir}/nfsdclnts
+%{abidir}/exportfs-option.list
+%{abidir}/nfsstat-option.list
+%{abidir}/rpcdebug-option.list
+%{abidir}/rpc.mountd-option.list
+%{abidir}/showmount-option.list
+%{abidir}/rpc.idmapd-option.list
+%{abidir}/mountstats-option.list
+%{abidir}/nfsiostat-option.list
+%{abidir}/nfsidmap-option.list
+%{abidir}/blkmapd-option.list
+%{abidir}/nfsdcld-option.list
+%{abidir}/nfsdclddb-option.list
 %{_libexecdir}/nfsrahead
 %{_udevrulesdir}/99-nfs.rules
 %{_mandir}/*/*
@@ -362,9 +379,15 @@ fi
 %doc linux-nfs/THANKS linux-nfs/TODO
 
 %files -n libnfsidmap
+%dir %{abidir}
 %doc support/nfsidmap/AUTHORS support/nfsidmap/README support/nfsidmap/COPYING
 %config(noreplace) %{_sysconfdir}/idmapd.conf
 %{_libdir}/libnfsidmap.so.*
+%{abidir}/libnfsidmap*.dump
+%{abidir}/nsswitch.dump
+%{abidir}/regex.dump
+%{abidir}/static.dump
+%{abidir}/umich_ldap.dump
 %{_libdir}/libnfsidmap/*.so
 %{_mandir}/man3/nfs4_uid_to_name.*
 
@@ -388,6 +411,9 @@ fi
 %{_sbindir}/rpc.gssd
 %{_sbindir}/start-statd
 %{_sbindir}/showmount
+%{abidir}/nfsidmap-option.list
+%{abidir}/nfsstat-option.list
+%{abidir}/showmount-option.list
 %attr(4755,root,root) /sbin/mount.nfs
 /sbin/mount.nfs4
 /sbin/rpc.statd
@@ -427,6 +453,8 @@ fi
 %{_sbindir}/nfsidmap
 %{_sbindir}/nfsconvert
 %{_sbindir}/nfsstat
+%{abidir}/nfsidmap-option.list
+%{abidir}/nfsstat-option.list
 %attr(755,root,root) %{_libexecdir}/nfs-utils/nfsconvert.sh
 %attr(4755,root,root) /sbin/mount.nfs
 /sbin/mount.nfs4
@@ -455,10 +483,15 @@ fi
 %files -n nfs-stats-utils
 %{_sbindir}/mountstats
 %{_sbindir}/nfsiostat
+%{abidir}/mountstats-option.list
+%{abidir}/nfsiostat-option.list
 %{_mandir}/*/mountstats.8.gz
 %{_mandir}/*/nfsiostat.8.gz
 
 %changelog
+* Mon Oct 24 2022 mgb01105731 <mgb01105731@alibaba-inc.com> - 2.6.2-2
+- optimise spec file
+
 * Fri Sep 23 2022 mgb01105731 <mgb01105731@alibaba-inc.com> - 2.6.2-1
 - update to 2.6.2
 
-- 
Gitee