]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
redhat: package libuafs perl bindings
authorMichael Meffie <mmeffie@sinenomine.net>
Wed, 21 Feb 2018 01:31:11 +0000 (20:31 -0500)
committerBenjamin Kaduk <kaduk@mit.edu>
Fri, 23 Feb 2018 04:03:02 +0000 (23:03 -0500)
Require the swig package as a build dependency. Build and package the
libuafs perl bindings.  Place these libraries in the openafs-devel
package, along with the man page (moved from the openfs-client package).

This fixes an rpm build error when the swig package is present on the
build system,

    RPM build errors:
    Installed (but unpackaged) file(s) found:
    /usr/lib64/perl/AFS/ukernel.pm
    /usr/lib64/perl/ukernel.so

FIXES 134470

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

Change-Id: I892e1f58e92f1eb66eeae8fb0d237bed0bdb2a62
Reviewed-on: https://gerrit.openafs.org/12921
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
src/packaging/RedHat/openafs.spec.in

index 72008e9784bbf2205cbb6a83b7c029b453097e99..410ddc74eb3af2b9d001f83e1a9430d170f9dd56 100644 (file)
@@ -96,7 +96,7 @@ BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison
 BuildRequires: systemd-units
 %endif
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
-BuildRequires: perl-devel
+BuildRequires: perl-devel, swig
 %endif
 BuildRequires: perl(ExtUtils::Embed)
 %if %{krb5support}
@@ -609,6 +609,11 @@ export KRB5_CONFIG
 %endif
 %if %{krb5support}
        --with-krb5 \
+%endif
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
+    --with-swig \
+%else
+    --without-swig \
 %endif
        $config_opts \
        || exit 1
@@ -809,6 +814,9 @@ 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
+%if !(0%{?fedora} >= 15 || 0%{?rhel} >= 6)
+rm -f %{_mandir}/man3/AFS::ukernel.3
+%endif
 
 #-----------------------------------------------------------------------------
 # Install client and server initscripts/systemd files
@@ -1208,7 +1216,6 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %endif
 %{_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
@@ -1354,6 +1361,11 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||:
 %{_libdir}/libubik.a
 %{_mandir}/man1/rxgen.1.gz
 %{_mandir}/man1/afs_compile_et.1.gz
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
+%{_libdir}/perl/AFS/ukernel.pm
+%{_libdir}/perl/ukernel.so
+%{_mandir}/man3/AFS::ukernel.3.gz
+%endif
 
 %if %{build_dkmspkg}
 %files -n dkms-%{name}