From: Michael Meffie <mmeffie@sinenomine.net>
Date: Thu, 20 Jul 2017 08:13:04 +0000 (-0400)
Subject: redhat: specify man pages without wildcards
X-Git-Tag: openafs-devel-1_9_0~670
X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=671db4ca5a76625d9b7133510cc1cbdda8a5d9b9

redhat: specify man pages without wildcards

Currently, some of the man pages are specified with the full name and
some are specified with a wildcard for the filename extension. Instead,
specify all the man pages without a wildcards to be more consistent and
to avoid putting incorrect man pages in packages.

This change removes a stray copy the klog.krb5.1 man page from
openafs-kauth-client subpackage and moves the AuthLog/AuthLog.dir man
pages to the optional openafs-kauth-server subpackage.

Change-Id: Id30a6174c532a9a00f850d6ca2722158293d5118
Reviewed-on: https://gerrit.openafs.org/12731
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
---

diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in
index 4ffc242..405a205 100644
--- a/src/packaging/RedHat/openafs.spec.in
+++ b/src/packaging/RedHat/openafs.spec.in
@@ -1091,7 +1091,6 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %defattr(-,root,root)
 %config(noreplace) /etc/sysconfig/openafs
 %doc %{_docdir}/openafs-%{afsvers}/LICENSE
-%exclude %{_mandir}/man1/klog.krb5.*
 %{_bindir}/afsmonitor
 %{_bindir}/bos
 %{_bindir}/fs
@@ -1119,43 +1118,45 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %{_sbindir}/vsys
 %{_libdir}/libafshcrypto.so.*
 %{_libdir}/librokenafs.so.*
-%{_mandir}/man1/afs.*
-%{_mandir}/man1/afsmonitor.*
-%{_mandir}/man1/fs.*
-%{_mandir}/man1/fs_*.*
-%{_mandir}/man1/pagsh.*
-%{_mandir}/man1/pts.*
-%{_mandir}/man1/pts_*.*
-%{_mandir}/man1/restorevol.*
-%{_mandir}/man1/rxdebug.*
-%{_mandir}/man1/scout.*
-%{_mandir}/man1/sys.*
-%{_mandir}/man1/tokens.*
-%{_mandir}/man1/translate_et.*
-%{_mandir}/man1/udebug.*
-%{_mandir}/man1/unlog.*
-%{_mandir}/man1/vos.*
-%{_mandir}/man1/vos_*.*
-%{_mandir}/man1/xstat_cm_test.*
-%{_mandir}/man1/xstat_fs_test.*
-%{_mandir}/man5/CellServDB.*
-%{_mandir}/man5/ThisCell.*
-%{_mandir}/man5/afsmonitor.*
-%{_mandir}/man5/butc.*
-%{_mandir}/man5/butc_logs.*
-%{_mandir}/man5/uss.*
-%{_mandir}/man5/uss_bulk.*
-%{_mandir}/man8/backup.*
-%{_mandir}/man8/backup_*.*
-%{_mandir}/man8/bos.*
-%{_mandir}/man8/bos_*.*
-%{_mandir}/man8/butc.*
-%{_mandir}/man8/fms.*
-%{_mandir}/man8/fstrace.*
-%{_mandir}/man8/fstrace_*.*
-%{_mandir}/man8/read_tape.*
-%{_mandir}/man8/uss.*
-%{_mandir}/man8/uss_*.*
+%{_mandir}/man1/afs.1.gz
+%{_mandir}/man1/afsmonitor.1.gz
+%{_mandir}/man1/fs.1.gz
+%{_mandir}/man1/fs_*.1.gz
+%{_mandir}/man1/pagsh.1.gz
+%{_mandir}/man1/pagsh.krb.1.gz
+%{_mandir}/man1/pts.1.gz
+%{_mandir}/man1/pts_*.1.gz
+%{_mandir}/man1/restorevol.1.gz
+%{_mandir}/man1/rxdebug.1.gz
+%{_mandir}/man1/scout.1.gz
+%{_mandir}/man1/sys.1.gz
+%{_mandir}/man1/tokens.1.gz
+%{_mandir}/man1/tokens.krb.1.gz
+%{_mandir}/man1/translate_et.1.gz
+%{_mandir}/man1/udebug.1.gz
+%{_mandir}/man1/unlog.1.gz
+%{_mandir}/man1/vos.1.gz
+%{_mandir}/man1/vos_*.1.gz
+%{_mandir}/man1/xstat_cm_test.1.gz
+%{_mandir}/man1/xstat_fs_test.1.gz
+%{_mandir}/man5/CellServDB.5.gz
+%{_mandir}/man5/ThisCell.5.gz
+%{_mandir}/man5/afsmonitor.5.gz
+%{_mandir}/man5/butc.5.gz
+%{_mandir}/man5/butc_logs.5.gz
+%{_mandir}/man5/uss.5.gz
+%{_mandir}/man5/uss_bulk.5.gz
+%{_mandir}/man8/backup.8.gz
+%{_mandir}/man8/backup_*.8.gz
+%{_mandir}/man8/bos.8.gz
+%{_mandir}/man8/bos_*.8.gz
+%{_mandir}/man8/butc.8.gz
+%{_mandir}/man8/fms.8.gz
+%{_mandir}/man8/fstrace.8.gz
+%{_mandir}/man8/fstrace_*.8.gz
+%{_mandir}/man8/read_tape.8.gz
+%{_mandir}/man8/uss.8.gz
+%{_mandir}/man8/uss_*.8.gz
 
 %files docs
 %defattr(-,root,root)
@@ -1187,17 +1188,17 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %{_unitdir}/openafs-client.service
 %{_sysconfdir}/sysconfig/modules/openafs-client.modules
 %endif
-%{_mandir}/man1/cmdebug.*
-%{_mandir}/man1/up.*
-%{_mandir}/man3/AFS::ukernel.*
+%{_mandir}/man1/cmdebug.1.gz
+%{_mandir}/man1/up.1.gz
+%{_mandir}/man3/AFS::ukernel.3.gz
 %{_mandir}/man5/afs.5.gz
 %{_mandir}/man5/afs_cache.5.gz
 %{_mandir}/man5/afs_volume_header.5.gz
 %{_mandir}/man5/afszcm.cat.5.gz
-%{_mandir}/man5/cacheinfo.*
-%{_mandir}/man8/afsd.*
-%{_mandir}/man8/vsys.*
-%{_mandir}/man5/CellAlias.*
+%{_mandir}/man5/cacheinfo.5.gz
+%{_mandir}/man8/afsd.8.gz
+%{_mandir}/man8/vsys.8.gz
+%{_mandir}/man5/CellAlias.5.gz
 
 %files server
 %defattr(-,root,root)
@@ -1235,57 +1236,56 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %else
 %{_unitdir}/openafs-server.service
 %endif
-%{_mandir}/man5/AuthLog.*
-%{_mandir}/man5/BackupLog.*
-%{_mandir}/man5/BosConfig.*
-%{_mandir}/man5/BosLog.*
-%{_mandir}/man5/FORCESALVAGE.*
-%{_mandir}/man5/FileLog.*
-%{_mandir}/man5/KeyFile.*
-%{_mandir}/man5/KeyFileExt.*
-%{_mandir}/man5/NetInfo.*
-%{_mandir}/man5/NetRestrict.*
-%{_mandir}/man5/NoAuth.*
-%{_mandir}/man5/PtLog.*
-%{_mandir}/man5/SALVAGE.fs.*
-%{_mandir}/man5/SalvageLog.*
-%{_mandir}/man5/sysid.*
-%{_mandir}/man5/UserList.*
-%{_mandir}/man5/VLLog.*
-%{_mandir}/man5/VolserLog.*
-%{_mandir}/man5/bdb.DB0.*
-%{_mandir}/man5/fms.log.*
-%{_mandir}/man5/krb.conf.*
-%{_mandir}/man5/krb.excl.*
-%{_mandir}/man5/prdb.DB0.*
-%{_mandir}/man5/salvage.lock.*
-%{_mandir}/man5/tapeconfig.*
-%{_mandir}/man5/vldb.DB0.*
-%{_mandir}/man8/bosserver.*
-%{_mandir}/man8/buserver.*
-%{_mandir}/man8/fileserver.*
-%{_mandir}/man8/dafileserver.*
-%{_mandir}/man8/dafssync-debug.*
-%{_mandir}/man8/dafssync-debug_*.*
-%{_mandir}/man8/dasalvager.*
-%{_mandir}/man8/davolserver.*
-%{_mandir}/man8/fssync-debug.*
-%{_mandir}/man8/fssync-debug_*.*
-%{_mandir}/man8/prdb_check.*
-%{_mandir}/man8/ptserver.*
-%{_mandir}/man8/pt_util.*
-%{_mandir}/man8/salvager.*
-%{_mandir}/man8/salvageserver.*
-%{_mandir}/man8/state_analyzer.*
-%{_mandir}/man8/upclient.*
-%{_mandir}/man8/upserver.*
-%{_mandir}/man8/vldb_check.*
-%{_mandir}/man8/vldb_convert.*
-%{_mandir}/man8/vlserver.*
-%{_mandir}/man8/voldump.*
-%{_mandir}/man8/volinfo.*
-%{_mandir}/man8/volscan.*
-%{_mandir}/man8/volserver.*
+%{_mandir}/man5/BackupLog.5.gz
+%{_mandir}/man5/BosConfig.5.gz
+%{_mandir}/man5/BosLog.5.gz
+%{_mandir}/man5/FORCESALVAGE.5.gz
+%{_mandir}/man5/FileLog.5.gz
+%{_mandir}/man5/KeyFile.5.gz
+%{_mandir}/man5/KeyFileExt.5.gz
+%{_mandir}/man5/NetInfo.5.gz
+%{_mandir}/man5/NetRestrict.5.gz
+%{_mandir}/man5/NoAuth.5.gz
+%{_mandir}/man5/PtLog.5.gz
+%{_mandir}/man5/SALVAGE.fs.5.gz
+%{_mandir}/man5/SalvageLog.5.gz
+%{_mandir}/man5/sysid.5.gz
+%{_mandir}/man5/UserList.5.gz
+%{_mandir}/man5/VLLog.5.gz
+%{_mandir}/man5/VolserLog.5.gz
+%{_mandir}/man5/bdb.DB0.5.gz
+%{_mandir}/man5/fms.log.5.gz
+%{_mandir}/man5/krb.conf.5.gz
+%{_mandir}/man5/krb.excl.5.gz
+%{_mandir}/man5/prdb.DB0.5.gz
+%{_mandir}/man5/salvage.lock.5.gz
+%{_mandir}/man5/tapeconfig.5.gz
+%{_mandir}/man5/vldb.DB0.5.gz
+%{_mandir}/man8/bosserver.8.gz
+%{_mandir}/man8/buserver.8.gz
+%{_mandir}/man8/fileserver.8.gz
+%{_mandir}/man8/dafileserver.8.gz
+%{_mandir}/man8/dafssync-debug.8.gz
+%{_mandir}/man8/dafssync-debug_*.8.gz
+%{_mandir}/man8/dasalvager.8.gz
+%{_mandir}/man8/davolserver.8.gz
+%{_mandir}/man8/fssync-debug.8.gz
+%{_mandir}/man8/fssync-debug_*.8.gz
+%{_mandir}/man8/prdb_check.8.gz
+%{_mandir}/man8/ptserver.8.gz
+%{_mandir}/man8/pt_util.8.gz
+%{_mandir}/man8/salvager.8.gz
+%{_mandir}/man8/salvageserver.8.gz
+%{_mandir}/man8/state_analyzer.8.gz
+%{_mandir}/man8/upclient.8.gz
+%{_mandir}/man8/upserver.8.gz
+%{_mandir}/man8/vldb_check.8.gz
+%{_mandir}/man8/vldb_convert.8.gz
+%{_mandir}/man8/vlserver.8.gz
+%{_mandir}/man8/voldump.8.gz
+%{_mandir}/man8/volinfo.8.gz
+%{_mandir}/man8/volscan.8.gz
+%{_mandir}/man8/volserver.8.gz
 
 %if %{build_authlibs}
 %files authlibs
@@ -1334,8 +1334,8 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %{_libdir}/librxkad.a
 %{_libdir}/librxstat.a
 %{_libdir}/libubik.a
-%{_mandir}/man1/rxgen.*
-%{_mandir}/man1/afs_compile_et.*
+%{_mandir}/man1/rxgen.1.gz
+%{_mandir}/man1/afs_compile_et.1.gz
 
 %if %{build_dkmspkg}
 %files -n dkms-%{name}
@@ -1374,22 +1374,25 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %{_prefix}/afsws/bin/klog
 %{_prefix}/afsws/bin/klog.krb
 %{_prefix}/afsws/etc/kas
-%{_mandir}/man1/kapasswd.*
-%{_mandir}/man1/klog.*
-%{_mandir}/man8/kpwvalid.*
-%{_mandir}/man8/kas.*
-%{_mandir}/man8/kas_*.*
+%{_mandir}/man1/kapasswd.1.gz
+%{_mandir}/man1/klog.1.gz
+%{_mandir}/man1/klog.krb.1.gz
+%{_mandir}/man8/kpwvalid.8.gz
+%{_mandir}/man8/kas.8.gz
+%{_mandir}/man8/kas_*.8.gz
 
 %files kauth-server
 %defattr(-,root,root)
 %{_prefix}/afs/bin/kaserver
 %{_prefix}/afs/bin/ka-forwarder
 %{_sbindir}/kadb_check
-%{_mandir}/man5/kaserver.DB0.*
-%{_mandir}/man5/kaserverauxdb.*
-%{_mandir}/man8/kadb_check.*
-%{_mandir}/man8/ka-forwarder.*
-%{_mandir}/man8/kaserver.*
+%{_mandir}/man5/AuthLog.5.gz
+%{_mandir}/man5/AuthLog.dir.5.gz
+%{_mandir}/man5/kaserver.DB0.5.gz
+%{_mandir}/man5/kaserverauxdb.5.gz
+%{_mandir}/man8/kadb_check.8.gz
+%{_mandir}/man8/ka-forwarder.8.gz
+%{_mandir}/man8/kaserver.8.gz
 %endif
 
 %if %{krb5support}
@@ -1399,10 +1402,10 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %{_bindir}/klog.krb5
 %{_sbindir}/akeyconvert
 %{_sbindir}/asetkey
-%{_mandir}/man1/aklog.*
-%{_mandir}/man1/klog.krb5.*
-%{_mandir}/man8/akeyconvert.*
-%{_mandir}/man8/asetkey.*
+%{_mandir}/man1/aklog.1.gz
+%{_mandir}/man1/klog.krb5.1.gz
+%{_mandir}/man8/akeyconvert.8.gz
+%{_mandir}/man8/asetkey.8.gz
 %endif
 
 %endif