Description of problem:

Newly brewed qpid-cpp-mrg-0.14-5.el5 rpm set which contains
  debuginfo symbols in qpid-cpp-mrg-debuginfo-0.14-5.el5
is not installable with qpid-qmf-0.14-2.el5's debuginfo symbols (qpid-qmf-debuginfo-0.14-2.el5)


Recent changes in qpid/messaging/Session.h and qpid/types/Variant.h (which are listed below) results in following installation failure:

Preparing...                ########################################### [100%]
        file /usr/src/debug/qpid-0.14/cpp/include/qpid/messaging/Session.h from install of qpid-cpp-mrg-debuginfo-0.14-5.el5.i386 conflicts with file from package qpid-qmf-debuginfo-0.14-2.el5.i386
        file /usr/src/debug/qpid-0.14/cpp/include/qpid/types/Variant.h from install of qpid-cpp-mrg-debuginfo-0.14-5.el5.i386 conflicts with file from package qpid-qmf-debuginfo-0.14-2.el5.i386


qpid-qmf should be respun to reflact latest header file changes (see below).


Version-Release number of selected component (if applicable):
qpid-qmf-debuginfo-0.14-2.el5
qpid-cpp-mrg-0.14-4.el5 -> qpid-cpp-mrg-0.14-5.el5

How reproducible:
100%

Steps to Reproduce:
1. upgrade from qpid-cpp-mrg-0.14-4.el5 to qpid-cpp-mrg-0.14-5.el5
  

Actual results:
qpid-cpp-mrg-debuginfo(-0.14-5.el5) cannot be installed side by side with qpid-qmf-debuginfo(-0.14-2.el5)

Expected results:
qpid-cpp-mrg-debuginfo should be installable side by side with qpid-qmf-debuginfo

Additional info:

qpid-cpp-mrg-debuginfo and qpid-qmf-debuginfo share the same files:

  [root@dhcp-27-79 ~]# rpm -ql qpid-cpp-mrg-debuginfo | grep -E '/Session.h|/Variant.h'
  /usr/src/debug/qpid-0.14/cpp/include/qpid/client/Session.h
  /usr/src/debug/qpid-0.14/cpp/include/qpid/messaging/Session.h
  /usr/src/debug/qpid-0.14/cpp/include/qpid/types/Variant.h
  /usr/src/debug/qpid-0.14/cpp/src/qmf/org/apache/qpid/broker/Session.h
  [root@dhcp-27-79 ~]# rpm -ql qpid-qmf-debuginfo | grep -E '/Session.h|/Variant.h'
  /usr/src/debug/qpid-0.14/cpp/include/qpid/client/Session.h
  /usr/src/debug/qpid-0.14/cpp/include/qpid/messaging/Session.h
  /usr/src/debug/qpid-0.14/cpp/include/qpid/types/Variant.h

Recent changes in qpid/messaging/Session.h and qpid/types/Variant.h

  [root@dhcp-27-79 ~]# diff -u /usr/src/debug/qpid-0.14/cpp/include/qpid/messaging/Session.h.0 /usr/src/debug/qpid-0.14/cpp/include/qpid/messaging/Session.h
  --- /usr/src/debug/qpid-0.14/cpp/include/qpid/messaging/Session.h.0     2012-02-06 13:04:18.000000000 +0100
  +++ /usr/src/debug/qpid-0.14/cpp/include/qpid/messaging/Session.h       2012-02-03 15:26:05.000000000 +0100
  @@ -84,10 +84,6 @@
        */
      QPID_MESSAGING_EXTERN void acknowledge(Message&, bool sync=false);
      /**
  -     * Acknowledges all message up to the specified message.
  -     */
  -    QPID_MESSAGING_EXTERN void acknowledgeUpTo(Message&, bool sync=false);
  -    /**
        * Rejects the specified message. The broker does not redeliver a
        * message that has been rejected. Once a message has been
        * acknowledged, it can no longer be rejected.
  @@ -210,6 +206,11 @@
        */
      QPID_MESSAGING_EXTERN void checkError();
  
  +    /**
  +     * Acknowledges all message up to the specified message.
  +     */
  +    QPID_MESSAGING_EXTERN void acknowledgeUpTo(Message&, bool sync=false);
  +
  #ifndef SWIG
    private:
    friend class qpid::messaging::PrivateImplRef<Session>;
  [root@dhcp-27-79 ~]#
  [root@dhcp-27-79 ~]#
  [root@dhcp-27-79 ~]#
  [root@dhcp-27-79 ~]# diff -u /usr/src/debug/qpid-0.14/cpp/include/qpid/types/Variant.h.0 /usr/src/debug/qpid-0.14/cpp/include/qpid/types/Variant.h
  --- /usr/src/debug/qpid-0.14/cpp/include/qpid/types/Variant.h.0 2012-02-06 13:04:25.000000000 +0100
  +++ /usr/src/debug/qpid-0.14/cpp/include/qpid/types/Variant.h   2012-02-03 15:26:05.000000000 +0100
  @@ -120,6 +120,10 @@
        * value. Recognises integers, doubles and booleans.
        */
      QPID_TYPES_EXTERN Variant& parse(const std::string&);
  +    /**
  +     * fromString() is deprecated - use parse() instead.
  +     */
  +    QPID_TYPES_EXTERN Variant& fromString(const std::string& s);
  
      QPID_TYPES_EXTERN bool asBool() const;
      QPID_TYPES_EXTERN uint8_t asUint8() const;