[qpid-cpp/f19] Removed parameterized ldconfig.

[Darryl L. Pierce]

commit c4f23b816e6a45f98b2d8c9fa65e41ab5ebf50ae
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Thu Jul 10 08:23:26 2014 -0400

    Removed parameterized ldconfig.
    
    - Removed comments between subpackages.
    - * This is what appears to have caused the (post)install error messages.

 qpid-cpp.spec |   84 +++++++++++++++++++++++---------------------------------
 1 files changed, 35 insertions(+), 49 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index f915330..8dd4082 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -1,28 +1,9 @@
 # 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:       10%{?dist}
+Release:       11%{?dist}
 Summary:       Libraries for Qpid C++ client applications
 License:       ASL 2.0
 URL:           http://qpid.apache.org
@@ -73,7 +54,7 @@ Run-time libraries for AMQP client applications developed using Qpid
 C++. Clients exchange messages with an AMQP message broker using
 the AMQP protocol.
 
-# === qpid-cpp-client
+
 
 %package client
 Summary:   Libraries for Qpid C++ client applications
@@ -117,11 +98,11 @@ the AMQP protocol.
 %dir %{_sysconfdir}/qpid
 %config(noreplace) %{_sysconfdir}/qpid/qpidc.conf
 
-%post client -p %{ldconfig}
+%post client -p /sbin/ldconfig
+
+%postun client -p /sbin/ldconfig
 
-%postun client -p %{ldconfig}
 
-# === qpid-cpp-client-devel
 
 %package client-devel
 Summary:   Header files, documentation and testing tools for developing Qpid C++ clients
@@ -170,11 +151,11 @@ in C++ using Qpid.  Qpid implements the AMQP messaging specification.
 %{_bindir}/qpid-txtest
 %{_libexecdir}/qpid/tests
 
-%post client-devel -p %{ldconfig}
+%post client-devel -p /sbin/ldconfig
+
+%postun client-devel -p /sbin/ldconfig
 
-%postun client-devel -p %{ldconfig}
 
-# === qpid-cpp-client-devel-docs
 
 %package client-devel-docs
 Summary:   AMQP client development documentation
@@ -188,7 +169,7 @@ format for easy browsing.
 %files client-devel-docs
 %doc %{_pkgdocdir}
 
-# === qpid-cpp-server
+
 
 %package server
 Summary:   An AMQP message broker daemon
@@ -237,9 +218,9 @@ exit 0
 
 %postun server
 %systemd_postun_with_restart qpidd.service
-%{ldconfig}
+/sbin/ldconfig
+
 
-# === qpid-cpp-server-ha
 
 %package server-ha
 Summary: Provides extensions to the AMQP message broker to provide high availability
@@ -261,7 +242,7 @@ Requires(postun): systemd-units
 %{_libdir}/qpid/daemon/ha.so
 
 %post server-ha
-%{ldconfig}
+/sbin/ldconfig
 %systemd_post qpidd-primary.service
 
 %preun server-ha
@@ -269,9 +250,9 @@ Requires(postun): systemd-units
 
 %postun server-ha
 %systemd_postun_with_restart qpidd-primary.service
-%{ldconfig}
+/sbin/ldconfig
+
 
-# === qpid-cpp-client-rdma
 
 %ifnarch s390 s390x %{arm}
 %package client-rdma
@@ -289,11 +270,11 @@ Infiniband) as the transport for Qpid messaging.
 %{_libdir}/qpid/client/rdmaconnector.so*
 %config(noreplace) %{_sysconfdir}/qpid/qpidc.conf
 
-%post client-rdma -p %{ldconfig}
+%post client-rdma -p /sbin/ldconfig
+
+%postun client-rdma -p /sbin/ldconfig
 
-%postun client-rdma -p %{ldconfig}
 
-# === qpid-cpp-server-rdma
 
 %package server-rdma
 Summary:   RDMA Protocol support (including Infiniband) for the Qpid daemon
@@ -309,12 +290,12 @@ transport for AMQP messaging.
 %files server-rdma
 %{_libdir}/qpid/daemon/rdma.so
 
-%post server-rdma -p %{ldconfig}
+%post server-rdma -p /sbin/ldconfig
 
-%postun server-rdma -p %{ldconfig}
+%postun server-rdma -p /sbin/ldconfig
 %endif
 
-# === qpid-cpp-server-xml
+
 
 %package server-xml
 Summary:  XML extensions for the Qpid daemon
@@ -331,11 +312,11 @@ messages.
 %files server-xml
 %{_libdir}/qpid/daemon/xml.so
 
-%post server-xml -p %{ldconfig}
+%post server-xml -p /sbin/ldconfig
+
+%postun server-xml -p /sbin/ldconfig
 
-%postun server-xml -p %{ldconfig}
 
-# === qpid-cpp-server-store
 
 %package server-store
 Summary:   Red Hat persistence extension to the Qpid messaging system
@@ -354,12 +335,12 @@ with Berkeley DB.
 %files server-store
 %{_libdir}/qpid/daemon/legacystore.so
 
-%post server-store -p %{ldconfig}
+%post server-store -p /sbin/ldconfig
+
+%postun server-store -p /sbin/ldconfig
 
-%postun server-store -p %{ldconfig}
 
 
-# === qpid-cpp-server-linearstore
 #
 # % package server-linearstore
 # Summary: Red Hat persistence extension to the Qpid messaging system
@@ -378,7 +359,7 @@ with Berkeley DB.
 # % {_libdir}/qpid/daemon/linearstore.so
 # % {_libdir}/liblinearstoreutils.so
 
-# === qpid-tools
+
 
 %package -n qpid-tools
 Summary:   Management and diagnostic tools for Apache Qpid
@@ -507,13 +488,18 @@ popd
 # clean up leftover ruby files
 rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
 
-%post -p %{ldconfig}
+%post -p /sbin/ldconfig
 
-%postun -p %{ldconfig}
+%postun -p /sbin/ldconfig
 
 
 %changelog
-* Thu Jul  3 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.28-10
+* Thu Jul 10 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.26-11
+- Removed parameterized ldconfig.
+- Removed comments between subpackages.
+- * This is what appears to have caused the (post)install error messages.
+
+* Thu Jul  3 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.26-10
 - Parameterized ldconfig location based on RHEL/Fedora release.
 
 * Tue Jun  3 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.26-9