[qpid-cpp/f20] Renamed the virtual provides to conform with project needs.

[Darryl L. Pierce]

commit 9c127f7e45cdcfefc225b37ed30970cafdae743d
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Thu Aug 14 11:31:59 2014 -0400

    Renamed the virtual provides to conform with project needs.

 qpid-cpp.spec |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 8dd4082..e2d16cc 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -3,7 +3,7 @@
 
 Name:          qpid-cpp
 Version:       0.26
-Release:       11%{?dist}
+Release:       12%{?dist}
 Summary:       Libraries for Qpid C++ client applications
 License:       ASL 2.0
 URL:           http://qpid.apache.org
@@ -59,12 +59,15 @@ the AMQP protocol.
 %package client
 Summary:   Libraries for Qpid C++ client applications
 
+# NOTE: The follow provide will be removed with 0.32
 Provides:  qpid(client)%{?_isa} = %{version}
 
 # !!! Remove with 0.28
 Provides:      qpid-cpp-client-ssl = %{version}
 Obsoletes:     qpid-cpp-client-ssl <= 0.24
 
+Provides:  qpid(cpp-client)%{?_isa} = %{version}
+
 Requires:  boost
 Requires:  chkconfig
 Requires:  initscripts
@@ -107,8 +110,12 @@ the AMQP protocol.
 %package client-devel
 Summary:   Header files, documentation and testing tools for developing Qpid C++ clients
 
+# NOTE: The follow provide will be removed with 0.32
 Provides:  qpid(client-devel)%{?_isa} = %{version}
 Requires:  qpid(client)%{?_isa} = %{version}
+
+Provides:  qpid(cpp-client-devel)%{?_isa} = %{version}
+Requires:  qpid(cpp-client)%{?_isa} = %{version}
 Requires:  boost-devel
 Requires:  boost-filesystem
 Requires:  boost-program-options
@@ -174,12 +181,14 @@ format for easy browsing.
 %package server
 Summary:   An AMQP message broker daemon
 
+# NOTE: The follow provide will be removed with 0.32
 Provides:  qpid(server)%{?_isa} = %{version}
+Requires:  qpid(client)%{?_isa} = %{version}
 # !!! Remove with 0.28
 Provides:      qpid-cpp-server-ssl = %{version}
 Obsoletes:     qpid-cpp-server-ssl <= 0.24
 
-Requires:  qpid(client)%{?_isa} = %{version}
+Provides:  qpid(cpp-server)%{?_isa} = %{version}
 Requires:  cyrus-sasl
 Requires:  qpid-proton-c%{?_isa} >= 0.5
 
@@ -225,8 +234,12 @@ exit 0
 %package server-ha
 Summary: Provides extensions to the AMQP message broker to provide high availability
 
+# NOTE: The follow provide will be removed with 0.32
 Provides: qpid(server-ha)%{?_isa} = %{version}
 Requires: qpid(server)%{?_isa} = %{version}
+
+Provides: qpid(cpp-server-ha)%{?_isa} = %{version}
+Requires: qpid(cpp-server)%{?_isa} = %{version}
 Requires: qpid-qmf%{?_isa}
 # for systemd
 Requires(post): systemd-units
@@ -258,9 +271,13 @@ Requires(postun): systemd-units
 %package client-rdma
 Summary:  RDMA Protocol support (including Infiniband) for Qpid clients
 
+# NOTE: The follow provide will be removed with 0.32
 Provides: qpid(client-rdma)%{?_isa} = %{version}
 Requires: qpid(client)%{?_isa} = %{version}
 
+Provides: qpid(cpp-client-rdma)%{?_isa} = %{version}
+Requires: qpid(cpp-client)%{?_isa} = %{version}
+
 %description client-rdma
 A client plugin and support library to support RDMA protocols (including
 Infiniband) as the transport for Qpid messaging.
@@ -279,10 +296,15 @@ Infiniband) as the transport for Qpid messaging.
 %package server-rdma
 Summary:   RDMA Protocol support (including Infiniband) for the Qpid daemon
 
+# NOTE: The follow provide will be removed with 0.32
 Provides: qpid(server-rdma)%{?_isa} = %{version}
 Requires: qpid(server)%{?_isa} = %{version}
 Requires: qpid(client-rdma)%{?_isa} = %{version}
 
+Provides: qpid(cpp-server-rdma)%{?_isa} = %{version}
+Requires: qpid(cpp-server)%{?_isa} = %{version}
+Requires: qpid(cpp-client-rdma}%{?_isa} = %{version}
+
 %description server-rdma
 A Qpid daemon plugin to support RDMA protocols (including Infiniband) as the
 transport for AMQP messaging.
@@ -300,8 +322,12 @@ transport for AMQP messaging.
 %package server-xml
 Summary:  XML extensions for the Qpid daemon
 
+# NOTE: The follow provide will be removed with 0.32
 Provides: qpid(server-xml)%{?_isa} = %{version}
 Requires: qpid(server)%{?_isa} = %{version}
+
+Provides: qpid(cpp-server-xml}%{?_isa} = %{version}
+Requires: qpid(cpp-server}%{?_isa} = %{version}
 Requires: xqilla
 Requires: xerces-c
 
@@ -322,8 +348,12 @@ messages.
 Summary:   Red Hat persistence extension to the Qpid messaging system
 License:   LGPLv2+
 
+# NOTE: The follow provide will be removed with 0.32
 Provides:  qpid(server-store)%{?_isa} = %{version}
 Requires:  qpid(server)%{?_isa} = %{version}
+
+Provides:  qpid(cpp-server-store)%{?_isa} = %{version}
+Requires:  qpid(cpp-server)%{?_isa} = %{version}
 Requires:  db4
 Requires:  libaio
 
@@ -346,8 +376,8 @@ with Berkeley DB.
 # Summary: Red Hat persistence extension to the Qpid messaging system
 # License: LGPLv2+
 #
-# Provides: qpid(server-linearstore) = %{version}
-# Requires: qpid(server)%{?_isa} = %{version}
+# Provides: qpid(cpp-server-linearstore) = %{version}
+# Requires: qpid(cpp-server)%{?_isa} = %{version}
 # Requires: db4
 # Requires: libaio
 #
@@ -494,6 +524,9 @@ rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
 
 
 %changelog
+* Thu Aug 14 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.26-12
+- Renamed the virtual provides to conform with project needs.
+
 * Thu Jul 10 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.26-11
 - Removed parameterized ldconfig.
 - Removed comments between subpackages.