diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-10-26 09:28:59 -0400 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-11-08 14:34:54 +0000 |
| commit | 4a1d413b78440b954eedd0cfae1b76656ed49841 (patch) | |
| tree | 3ebea664734663272dad5f6cbb012b85d23f8869 /glusterfs.spec.in | |
| parent | 22c312fc7d456a11b03835edd594f654f20ed10a (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#1644314
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index e4551c320d2..b3709ac6b8e 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -23,8 +23,8 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd %{?_without_bd:%global _without_bd --disable-bd-xlator} -%if ( 0%{?rhel} && 0%{?rhel} < 6 || 0%{?sles_version} ) -%global _without_bd --disable-bd-xlator +%if ( 0%{?rhel} && 0%{?rhel} > 7 ) +%global _without_bd --without-bd %endif # cmocka @@ -283,7 +283,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 @@ -1391,7 +1391,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 @@ -1505,6 +1507,9 @@ exit 0 %endif %changelog +* Tue Oct 30 2018 Kaleb S. KEITHLEY <kkeithle@redhat.com> +- liblvm2-devel no longer has liblvm2app.so + * Fri Sep 7 2018 Niels de Vos <ndevos@redhat.com> - Add an option to build with address sanitizer (ASAN) |