[compat-qpid-cpp] Removed extraneous provides that caused an unexpected conflict with qpid-cpp.

Darryl L. Pierce mcpierce at fedoraproject.org
Wed Aug 27 19:25:47 UTC 2014


commit 263a50f67674bbcc5cb7fc16a863df4dbf9214b1
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Wed Aug 27 15:25:42 2014 -0400

    Removed extraneous provides that caused an unexpected conflict with qpid-cpp.

 compat-qpid-cpp.spec |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/compat-qpid-cpp.spec b/compat-qpid-cpp.spec
index f0ae28b..0f2a658 100644
--- a/compat-qpid-cpp.spec
+++ b/compat-qpid-cpp.spec
@@ -21,7 +21,7 @@
 
 Name:          compat-qpid-cpp
 Version:       0.24
-Release:       18%{?dist}
+Release:       19%{?dist}
 Summary:       Libraries for Qpid C++ client applications
 License:       ASL 2.0
 URL:           http://qpid.apache.org
@@ -192,7 +192,6 @@ in C++ using Qpid.  Qpid implements the AMQP messaging specification.
 
 %package client-devel-docs
 Conflicts: qpid-cpp-client-devel-docs
-Provides:  qpid-cpp-client-devel-docs
 Summary:   AMQP client development documentation
 
 BuildArch: noarch
@@ -208,7 +207,6 @@ format for easy browsing.
 
 %package server
 Conflicts: qpid-cpp-server
-Provides:  qpid-cpp-server
 Summary:   An AMQP message broker daemon
 
 Provides:  qpid(server)%{?_isa} = %{version}
@@ -279,7 +277,6 @@ fi
 
 %package server-ha
 Conflicts: qpid-cpp-server-ha
-Provides:  qpid-cpp-server-ha
 Summary:   Provides extensions to the AMQP message broker to provide high availability
 
 Provides: qpid(server-ha)%{?_isa} = %{version}
@@ -318,7 +315,6 @@ fi
 %ifnarch s390 s390x
 %package client-rdma
 Conflicts: qpid-cpp-client-rdma
-Provides:  qpid-cpp-client-rdma
 Summary:    RDMA Protocol support (including Infiniband) for Qpid clients
 
 Provides:  qpid(client-rdma)%{?_isa} = %{version}
@@ -344,7 +340,6 @@ Infiniband) as the transport for Qpid messaging.
 
 %package server-rdma
 Conflicts: qpid-cpp-server-rdma
-Provides:  qpid-cpp-server-rdma
 Summary:   RDMA Protocol support (including Infiniband) for the Qpid daemon
 
 Provides:  qpid(server-rdma)%{?_isa} = %{version}
@@ -371,7 +366,6 @@ transport for AMQP messaging.
 
 %package server-xml
 Conflicts: qpid-cpp-server-xml
-Provides:  qpid-cpp-server-xml
 Summary:   XML extensions for the Qpid daemon
 
 Provides:  qpid(server-xml)%{?_isa} = %{version}
@@ -397,7 +391,6 @@ messages.
 
 %package server-store
 Conflicts: qpid-cpp-server-store
-Provides:  qpid-cpp-server-store
 Summary:   Red Hat persistence extension to the Qpid messaging system
 License:   LGPLv2+
 
@@ -424,7 +417,6 @@ with Berkeley DB.
 
 %package -n compat-qpid-tools
 Conflicts: qpid-tools
-Provides:  qpid-tools
 Summary:   Management and diagnostic tools for Apache Qpid
 
 BuildArch: noarch
@@ -580,6 +572,9 @@ rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
 
 
 %changelog
+* Wed Aug 27 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.24-19
+- Removed extraneous provides that caused an unexpected conflict with qpid-cpp.
+
 * Mon Aug 18 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.24-17
 - QPID-3650: Fixed building on ARM platforms.
 


More information about the scm-commits mailing list