]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
redhat: actually remove unused AFS::ukernel man page
authorMarcio Barbosa <mbarbosa@sinenomine.net>
Thu, 26 Jul 2018 17:30:35 +0000 (10:30 -0700)
committerBenjamin Kaduk <kaduk@mit.edu>
Sat, 28 Jul 2018 17:16:41 +0000 (13:16 -0400)
Commit 278581c24a802834719e0d57f27978321556c9bb (redhat: package libuafs
perl bindings) added swig as a build dependency on RHEL 6+/Fedora 15+ to
build and package AFS::ukernel perl bindings for libuafs.  The man page
for AFS::ukernel is generated from the pod files unconditionally, so
needs to be removed from the staging directories when AFS::ukernel is
not packaged.

Unfortunately, the full path to the staged AFS::ukernel manpage was
not given in that commit, so the rpmbuild will fail on RHEL 5 with
the error:

        RPM build errors:
        Installed (but unpackaged) file(s) found:
        /usr/share/man/man3/AFS::ukernel.3.gz

Fix this error by specifying the full path to the AFS::ukernel man page
to actually remove it when we are not packaging AFS::ukernel files.

[mmeffie: updated commit message]

Reviewed-on: https://gerrit.openafs.org/13257
Reviewed-by: Marcio Brito Barbosa <mbarbosa@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit a85aab9dfe7c2ee9e025bc15d849de2dd0a48913)

Change-Id: If81f930bd7e922cd5e71c0d459751d4bbe85c843
Reviewed-on: https://gerrit.openafs.org/13264
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
src/packaging/RedHat/openafs.spec.in

index 8938e0d8daf6637b9f35626dd320f47fd2484cc1..01592db08b8ec81644dea6b0c95167e265f07c23 100644 (file)
@@ -802,7 +802,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man5/AuthLog.5
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/AuthLog.dir.5
 %endif
 %if !(0%{?fedora} >= 15 || 0%{?rhel} >= 6)
-rm -f %{_mandir}/man3/AFS::ukernel.3
+rm -f $RPM_BUILD_ROOT%{_mandir}/man3/AFS::ukernel.3
 %endif
 
 #-----------------------------------------------------------------------------