diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-10-26 09:28:59 -0400 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-10-30 05:04:06 +0000 |
| commit | 0857d837d0f9350c91f57e1096683b5abf973dcb (patch) | |
| tree | 92af948e39c9a43659eb31cd619a4a37ade308a0 | |
| parent | 0f817c7795f115fb67b0973ce0965bcd3de8d196 (diff) | |
build/packaging: el-X (x > 7) isms
lvm2(-devel) 2.03.00 no longer has liblvm2app.so. (I expect a
similar change in fedora-30 before too much longer, but for
now fedora-30 still has lvm2 and lvm2-devel 2.02.181
rpcgen has been removed from glibc-common and unbundled rpcgen
is now required.
And I guess nobody has ever built rpms with '--without bd' or we
would have discovered the attempted inclusion of .../storage/bd.so
in the rpm when it hadn't actually been built.
Change-Id: I71e26c3d06af5d329ae89cc249a4ad88664ddf53
updates: bz#1193929
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | glusterfs.spec.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index fee21b639a4..971e8fc0b89 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -23,6 +23,10 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd %{?_without_bd:%global _without_bd --disable-bd-xlator} +%if ( 0%{?rhel} && 0%{?rhel} > 7 ) +%global _without_bd --without-bd +%endif + # cmocka # if you wish to compile an rpm with cmocka unit testing... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with cmocka @@ -256,7 +260,7 @@ BuildRequires: python-ctypes %if ( 0%{?_with_ipv6default:1} ) || ( 0%{!?_without_libtirpc:1} ) BuildRequires: libtirpc-devel %endif -%if ( 0%{?fedora} && 0%{?fedora} > 27 ) +%if ( 0%{?fedora} && 0%{?fedora} > 27 ) || ( 0%{?rhel} && 0%{?rhel} > 7 ) BuildRequires: rpcgen %endif BuildRequires: userspace-rcu-devel >= 0.7 @@ -1310,7 +1314,9 @@ exit 0 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage +%if ( 0%{!?_without_bd:1} ) %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/bd.so +%endif %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so |