[qpid-cpp/f20] Parameterized ldconfig location based on RHEL/Fedora release.

Darryl L. Pierce mcpierce at fedoraproject.org
Fri Jul 4 11:27:43 UTC 2014


commit e34c83bfe7adac3c98f072aa2d46947a808d312b
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Thu Jul 3 15:48:07 2014 -0400

    Parameterized ldconfig location based on RHEL/Fedora release.

 qpid-cpp.spec |   58 +++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 18 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 4b6c969..f915330 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -1,9 +1,28 @@
 # Define pkgdocdir for releases that don't define it already
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
+# since ldconfig is in a different space as of EL7/ we need to macroize it
+%if 0%{?fedora}
+
+%if 0%{?fedora} > 19
+%global ldconfig /usr/sbin/ldconfig
+%else
+%global ldconfig /sbin/ldconfig
+%endif
+
+%else
+
+%if 0%{?rhel} > 6
+%global ldconfig /usr/sbin/ldconfig
+%else
+%global ldconfig /sbin/ldconfig
+%endif
+
+%endif
+
 Name:          qpid-cpp
 Version:       0.26
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       Libraries for Qpid C++ client applications
 License:       ASL 2.0
 URL:           http://qpid.apache.org
@@ -98,9 +117,9 @@ the AMQP protocol.
 %dir %{_sysconfdir}/qpid
 %config(noreplace) %{_sysconfdir}/qpid/qpidc.conf
 
-%post client -p /sbin/ldconfig
+%post client -p %{ldconfig}
 
-%postun client -p /sbin/ldconfig
+%postun client -p %{ldconfig}
 
 # === qpid-cpp-client-devel
 
@@ -151,9 +170,9 @@ in C++ using Qpid.  Qpid implements the AMQP messaging specification.
 %{_bindir}/qpid-txtest
 %{_libexecdir}/qpid/tests
 
-%post client-devel -p /sbin/ldconfig
+%post client-devel -p %{ldconfig}
 
-%postun client-devel -p /sbin/ldconfig
+%postun client-devel -p %{ldconfig}
 
 # === qpid-cpp-client-devel-docs
 
@@ -218,7 +237,7 @@ exit 0
 
 %postun server
 %systemd_postun_with_restart qpidd.service
-/sbin/ldconfig
+%{ldconfig}
 
 # === qpid-cpp-server-ha
 
@@ -242,7 +261,7 @@ Requires(postun): systemd-units
 %{_libdir}/qpid/daemon/ha.so
 
 %post server-ha
-/sbin/ldconfig
+%{ldconfig}
 %systemd_post qpidd-primary.service
 
 %preun server-ha
@@ -250,7 +269,7 @@ Requires(postun): systemd-units
 
 %postun server-ha
 %systemd_postun_with_restart qpidd-primary.service
-/sbin/ldconfig
+%{ldconfig}
 
 # === qpid-cpp-client-rdma
 
@@ -270,9 +289,9 @@ Infiniband) as the transport for Qpid messaging.
 %{_libdir}/qpid/client/rdmaconnector.so*
 %config(noreplace) %{_sysconfdir}/qpid/qpidc.conf
 
-%post client-rdma -p /sbin/ldconfig
+%post client-rdma -p %{ldconfig}
 
-%postun client-rdma -p /sbin/ldconfig
+%postun client-rdma -p %{ldconfig}
 
 # === qpid-cpp-server-rdma
 
@@ -290,9 +309,9 @@ transport for AMQP messaging.
 %files server-rdma
 %{_libdir}/qpid/daemon/rdma.so
 
-%post server-rdma -p /sbin/ldconfig
+%post server-rdma -p %{ldconfig}
 
-%postun server-rdma -p /sbin/ldconfig
+%postun server-rdma -p %{ldconfig}
 %endif
 
 # === qpid-cpp-server-xml
@@ -312,9 +331,9 @@ messages.
 %files server-xml
 %{_libdir}/qpid/daemon/xml.so
 
-%post server-xml -p /sbin/ldconfig
+%post server-xml -p %{ldconfig}
 
-%postun server-xml -p /sbin/ldconfig
+%postun server-xml -p %{ldconfig}
 
 # === qpid-cpp-server-store
 
@@ -335,9 +354,9 @@ with Berkeley DB.
 %files server-store
 %{_libdir}/qpid/daemon/legacystore.so
 
-%post server-store -p /sbin/ldconfig
+%post server-store -p %{ldconfig}
 
-%postun server-store -p /sbin/ldconfig
+%postun server-store -p %{ldconfig}
 
 
 # === qpid-cpp-server-linearstore
@@ -488,12 +507,15 @@ popd
 # clean up leftover ruby files
 rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
 
-%post -p /sbin/ldconfig
+%post -p %{ldconfig}
 
-%postun -p /sbin/ldconfig
+%postun -p %{ldconfig}
 
 
 %changelog
+* Thu Jul  3 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.28-10
+- Parameterized ldconfig location based on RHEL/Fedora release.
+
 * Tue Jun  3 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.26-9
 - Fixed dependency of server-ha on qpid(server).
 


More information about the scm-commits mailing list