From 47ed784e3759df8b237436a86f0d27acbe5efa81 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 8 Mar 2019 10:17:14 -0500 Subject: packaging: rdma on s390x, unnecessary ldconfig scriptlets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit s390x has rdma since around fedora27, and in RHEL7 since July 2016. see https://src.fedoraproject.org/rpms/glusterfs/pull-request/5 Reported-By: Igor Gnatenko Reported-By: Dan Horák master branch Change-Ids: > Change-Id: Idad29425495f9c69bfd84b53b009a607abb418f0 > Change-Id: I914f36290e96a387cdd64ee633e75c2940ec1e56 Change-Id: I7747700e982b365533ebd031164708b9ad97f18a fixes: bz#1686875 Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index a2d1cdb9fb1..20abd358be7 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -84,8 +84,8 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma %{?_without_rdma:%global _without_rdma --disable-ibverbs} -# No RDMA Support on s390(x) -%ifarch s390 s390x armv7hl +# No RDMA Support on 32-bit ARM +%ifarch armv7hl %global _without_rdma --disable-ibverbs %endif @@ -982,22 +982,14 @@ exit 0 ## All %%postun should be placed here and keep them sorted ## %postun -/sbin/ldconfig %if ( 0%{!?_without_syslog:1} ) %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) %systemd_postun_with_restart rsyslog %endif %endif -%postun api -/sbin/ldconfig - -%postun libs -/sbin/ldconfig - %if ( 0%{!?_without_server:1} ) %postun server -/sbin/ldconfig %if (0%{?_with_firewalld:1}) %firewalld_reload %endif @@ -1389,6 +1381,14 @@ exit 0 %endif %changelog +* Wed Mar 6 2019 Kaleb S. KEITHLEY +- remove unneeded ldconfig in scriptlets +- reported by Igor Gnatenko in Fedora +- https://src.fedoraproject.org/rpms/glusterfs/pull-request/5 + +* Mon Mar 4 2019 Kaleb S. KEITHLEY +- s390x has RDMA, since around Fedora 27 and in RHEL7 since June 2016. + * Sun Feb 24 2019 Aravinda VK - Renamed events package to gfevents -- cgit