From: Michael Meffie <mmeffie@sinenomine.net>
Date: Sat, 22 Jul 2017 02:30:43 +0000 (-0400)
Subject: redhat: avoid rpmbuild exclude directives
X-Git-Tag: upstream/1.8.0_pre5^2~23
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=781624f7f4290a1f44a0f48a04d780e10dd5b3e1;p=packages%2Fo%2Fopenafs.git

redhat: avoid rpmbuild exclude directives

Older versions of rpmbuild do not support the files exclude directive,
so fall back to the old way in which we remove the files to be excluded
and list the files to be included.

Reviewed-on: https://gerrit.openafs.org/12733
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit a71288a387095ccb4be83c1abae34ada80f53185)

Change-Id: I01c20bc21ec6143be76458c311d826023c370d51
Reviewed-on: https://gerrit.openafs.org/12873
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 28cae528a..62095051e 100644
--- a/src/packaging/RedHat/openafs.spec.in
+++ b/src/packaging/RedHat/openafs.spec.in
@@ -738,6 +738,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so*
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkopenafs.so*
 %endif
 rm -f $RPM_BUILD_ROOT%{_sbindir}/afsd.fuse
+%if !%{kauth_support}
+rm -f $RPM_BUILD_ROOT%{_prefix}/afs/bin/tokens.krb
+rm -f $RPM_BUILD_ROOT%{_bindir}/tokens.krb
+rm -f $RPM_BUILD_ROOT%{_bindir}/pagsh.krb
+%endif
 
 # Relocate afsd to legacy path to match init scripts.
 mv $RPM_BUILD_ROOT%{_sbindir}/afsd $RPM_BUILD_ROOT%{_prefix}/vice/etc/afsd
@@ -798,6 +803,12 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man8/package.*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/akeyconvert.*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/asetkey.*
 %endif
+%if !%{kauth_support}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pagsh.krb.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tokens.krb.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man5/AuthLog.5
+rm -f $RPM_BUILD_ROOT%{_mandir}/man5/AuthLog.dir.5
+%endif
 
 #-----------------------------------------------------------------------------
 # Install client and server initscripts/systemd files
@@ -1359,11 +1370,33 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 
 %files compat
 %defattr(-,root,root)
-%{_prefix}/afsws
-%exclude %{_prefix}/afsws/bin/kapasswd
-%exclude %{_prefix}/afsws/bin/klog
-%exclude %{_prefix}/afsws/bin/klog.krb
-%exclude %{_prefix}/afsws/etc/kas
+%{_prefix}/afsws/bin/afsmonitor
+%{_prefix}/afsws/bin/bos
+%{_prefix}/afsws/bin/fs
+%{_prefix}/afsws/bin/pagsh
+%{_prefix}/afsws/bin/pts
+%{_prefix}/afsws/bin/restorevol
+%{_prefix}/afsws/bin/scout
+%{_prefix}/afsws/bin/sys
+%{_prefix}/afsws/bin/tokens
+%{_prefix}/afsws/bin/translate_et
+%{_prefix}/afsws/bin/udebug
+%{_prefix}/afsws/bin/unlog
+%{_prefix}/afsws/bin/xstat_cm_test
+%{_prefix}/afsws/bin/xstat_fs_test
+%{_prefix}/afsws/etc/backup
+%{_prefix}/afsws/etc/butc
+%{_prefix}/afsws/etc/fms
+%{_prefix}/afsws/etc/fstrace
+%{_prefix}/afsws/etc/read_tape
+%{_prefix}/afsws/etc/rxdebug
+%{_prefix}/afsws/etc/uss
+%{_prefix}/afsws/etc/vos
+%{_prefix}/afsws/etc/vsys
+%if %{kauth_support}
+%{_prefix}/afsws/bin/pagsh.krb
+%{_prefix}/afsws/bin/tokens.krb
+%endif
 
 %if %{kauth_support}
 %files kauth-client