From d51daf617f0f5cdd5f8c225bfafc74fc19b7d3b6 Mon Sep 17 00:00:00 2001 From: Stephan Wiesand Date: Sat, 8 Jan 2011 17:13:27 +0100 Subject: [PATCH] rpm: don't package files twice The LICENSE and two manpages were included in the main package as well as one of the others. Remove duplicate entries. Reviewed-on: http://gerrit.openafs.org/3628 Tested-by: BuildBot Reviewed-by: Derrick Brashear (cherry picked from commit 8d157961e96ec6b504ea40dcef51fb4a8d61d371) Change-Id: I4120181c4384aa0f3f6f4c016c594d45cf037921 Reviewed-on: http://gerrit.openafs.org/3818 Reviewed-by: Stephan Wiesand Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/packaging/RedHat/openafs.spec.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index 673787a2f..787fc8dee 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -1114,6 +1114,7 @@ gzip -9 $RPM_BUILD_ROOT%{_mandir}/man*/* # create list of man pages that go in the 'openafs' package /bin/ls $RPM_BUILD_ROOT%{_mandir}/man1 \ |egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^restorevol|^rxdebug|scout|^sys|tokens|translate|udebug|unlog|^uss|^vos' \ + |egrep -v '^afs_compile_et' \ >openafs-man1files /bin/ls $RPM_BUILD_ROOT%{_mandir}/man5 \ @@ -1426,7 +1427,11 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %files docs %defattr(-,root,root) -%doc %{_docdir}/openafs-%{afsvers} +%docdir %{_docdir}/openafs-%{afsvers} +%dir %{_docdir}/openafs-%{afsvers} +%{_docdir}/openafs-%{afsvers}/ChangeLog-%{afsvers} +%{_docdir}/openafs-%{afsvers}/RELNOTES-%{afsvers} +%{_docdir}/openafs-%{afsvers}/pdf %files client %defattr(-,root,root) @@ -1449,7 +1454,10 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %{_mandir}/man1/cmdebug.* %{_mandir}/man1/copyauth.* %{_mandir}/man1/up.* -%{_mandir}/man5/afs* +%{_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/rmtsysd.* -- 2.39.5