diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2c10182b..df77fcea 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
ruby-version:
- - '3.0'
+ - '3.1'
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
diff --git a/Dockerfile b/Dockerfile
index 3e162f48..0ca91203 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,12 +16,12 @@ RUN ARCH=$(uname -m) && \
dnf -y install \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
https://rpm.manageiq.org/release/18-radjabov/el8/noarch/manageiq-release-18.0-1.el8.noarch.rpm && \
- dnf -y module enable ruby:3.0 && \
+ dnf -y module enable ruby:3.1 && \
dnf -y module enable nodejs:18 && \
dnf -y module disable virt:rhel && \
if [ ${ARCH} != "s390x" ] ; then dnf config-manager --setopt=ubi-8-*.exclude=rpm* --save; fi && \
dnf -y group install "development tools" && \
- dnf config-manager --setopt=epel.exclude=*qpid-proton* --setopt=tsflags=nodocs --save && \
+ dnf config-manager --setopt=tsflags=nodocs --save && \
dnf -y install \
cmake \
copr-cli \
diff --git a/config/options.yml b/config/options.yml
index 4daa1c56..26db1ae5 100644
--- a/config/options.yml
+++ b/config/options.yml
@@ -49,7 +49,6 @@ rpm_repository:
:python-pylxca: !ruby/regexp /.+-2\.1\.1.+/
:python-unittest2: !ruby/regexp /.+-1\.1\.0.+/
:python-vspk: !ruby/regexp /.+-5\.3\.2.+/
- :qpid-proton: !ruby/regexp /.+-0\.30\.0.+/
:repmgr13: !ruby/regexp /.+-5\.2\.1.+/
:wmi: !ruby/regexp /.+-1\.3\.14.+/
:18-radjabov-nightly:
diff --git a/lib/manageiq/rpm_build/extra_package.rb b/lib/manageiq/rpm_build/extra_package.rb
index 6a4e435f..990045c8 100644
--- a/lib/manageiq/rpm_build/extra_package.rb
+++ b/lib/manageiq/rpm_build/extra_package.rb
@@ -87,9 +87,6 @@ class MockConfig
:mock_extras => "--enable-network",
:os => "centos-stream+epel",
},
- "qpid-proton" => {
- :os => "centos-stream+epel",
- },
"repmgr13" => {
:mock_extras => "--config-opts=module_setup_commands.module_install=postgresql:13",
:os => "centos-stream+epel",
diff --git a/lib/manageiq/rpm_build/generate_core.rb b/lib/manageiq/rpm_build/generate_core.rb
index b90b553d..f2957aad 100644
--- a/lib/manageiq/rpm_build/generate_core.rb
+++ b/lib/manageiq/rpm_build/generate_core.rb
@@ -104,7 +104,7 @@ def plugin_paths
def fixup_sti_loader!
sti_loader_yml_path = miq_dir.join("tmp/cache/sti_loader.yml")
- sti_loader = YAML.load_file(sti_loader_yml_path)
+ sti_loader = YAML.unsafe_load(File.read(sti_loader_yml_path))
# Replace paths from the rpm build with the paths that will exist at runtime
sti_loader.transform_keys! do |path|
diff --git a/packages/qpid-proton/licenses.xml b/packages/qpid-proton/licenses.xml
deleted file mode 100644
index 6e7a1b70..00000000
--- a/packages/qpid-proton/licenses.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- qpid-proton
- 0.30.0
-
-
- ASL 2.0
- http://www.apache.org/licenses/LICENSE-2.0
-
-
-
-
-
diff --git a/packages/qpid-proton/proton.patch b/packages/qpid-proton/proton.patch
deleted file mode 100644
index fa14c703..00000000
--- a/packages/qpid-proton/proton.patch
+++ /dev/null
@@ -1,421 +0,0 @@
-From b898529cfaceba6bc5887f6b2bddbc0a5bc1d7c8 Mon Sep 17 00:00:00 2001
-From: Kim van der Riet
-Date: Mon, 9 Dec 2019 13:56:27 -0500
-Subject: [PATCH 1/2] Removed sections from docs that require automodapi
- module, replaced with static tables instead. CMakeLists updated to not search
- for automodapi.
-
----
- python/CMakeLists.txt | 3 +-
- python/docs/conf.py | 1 -
- python/docs/proton.handlers.rst | 23 +++---
- python/docs/proton.reactor.rst | 55 ++++++++-----
- python/docs/proton.rst | 166 ++++++++++++++++++++++++++--------------
- python/docs/proton.utils.rst | 27 ++++---
- 6 files changed, 179 insertions(+), 96 deletions(-)
-
-diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
-index cb36b1c..a396319 100644
---- a/python/CMakeLists.txt
-+++ b/python/CMakeLists.txt
-@@ -120,8 +120,7 @@ py_compile(${CMAKE_CURRENT_SOURCE_DIR} "${pysrc}" PROTON_ARTIFACTS)
-
- # Sphinx documentation
- check_python_module("sphinx" SPHINX_MODULE_FOUND)
--check_python_module("sphinx_automodapi" SPHINX_AUTOMODAPI_MODULE_FOUND)
--if (NOT SPHINX_MODULE_FOUND OR NOT SPHINX_AUTOMODAPI_MODULE_FOUND)
-+if (NOT SPHINX_MODULE_FOUND)
- message(STATUS "Sphinx modules not found; doc generation disabled.")
- else ()
- add_custom_target(docs-py
-diff --git a/python/docs/conf.py b/python/docs/conf.py
-index 3f95201..e57ebfe 100644
---- a/python/docs/conf.py
-+++ b/python/docs/conf.py
-@@ -51,7 +51,6 @@ except IOError:
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
- # ones.
- extensions = [
-- 'sphinx_automodapi.automodapi', # needed for the module summaries (.. autosummary::)
- 'sphinx.ext.autodoc',
- 'sphinx.ext.viewcode',
- 'sphinx.ext.mathjax', # needed for math formulas on some versions of Sphinx
-diff --git a/python/docs/proton.handlers.rst b/python/docs/proton.handlers.rst
-index 662eb23..296d6f3 100644
---- a/python/docs/proton.handlers.rst
-+++ b/python/docs/proton.handlers.rst
-@@ -9,11 +9,15 @@ Module Summary
-
- |
-
--.. autosummary::
--
-- MessagingHandler
-- TransactionHandler
-- TransactionalClientHandler
-++-------------------------------------+----------------------------------------------------------------------------------------+
-+| :class:`MessagingHandler` | A general purpose handler that makes the proton-c events somewhat simpler to deal with |
-+| | and/or avoids repetitive tasks for common use cases. |
-++-------------------------------------+----------------------------------------------------------------------------------------+
-+| :class:`TransactionHandler` | The interface for transaction handlers - ie objects that want to be notified of state |
-+| | changes related to a transaction. |
-++-------------------------------------+----------------------------------------------------------------------------------------+
-+| :class:`TransactionalClientHandler` | An extension to the MessagingHandler for applications using transactions. |
-++-------------------------------------+----------------------------------------------------------------------------------------+
-
- |
-
-@@ -22,10 +26,11 @@ Exceptions
-
- |
-
--.. autosummary::
--
-- Reject
-- Release
-++------------------+-----------------------------------------------------------+
-+| :class:`Reject` | An exception that indicates a message should be rejected. |
-++------------------+-----------------------------------------------------------+
-+| :class:`Release` | An exception that indicates a message should be released. |
-++------------------+-----------------------------------------------------------+
-
- |
-
-diff --git a/python/docs/proton.reactor.rst b/python/docs/proton.reactor.rst
-index 750f042..23740ef 100644
---- a/python/docs/proton.reactor.rst
-+++ b/python/docs/proton.reactor.rst
-@@ -9,12 +9,20 @@ Module Summary
-
- |
-
--.. autosummary::
-- Container
-- ApplicationEvent
-- EventInjector
-- Backoff
-- Transaction
-++---------------------------+----------------------------------------------------------------------------------------------------+
-+| :class:`Container` | A representation of the AMQP concept of a ‘container’, which loosely speaking is something that |
-+| | establishes links to or from another container, over which messages are transfered. |
-++---------------------------+----------------------------------------------------------------------------------------------------+
-+| :class:`ApplicationEvent` | Application defined event, which can optionally be associated with an engine object and or an |
-+| | arbitrary subject. |
-++---------------------------+----------------------------------------------------------------------------------------------------+
-+| :class:`EventInjector` | Can be added to a :class:`Container` to allow events to be triggered by an external thread but |
-+| | handled on the event thread associated with the container. |
-++---------------------------+----------------------------------------------------------------------------------------------------+
-+| :class:`Backoff` | A reconnect strategy involving an increasing delay between retries, up to a maximum or 10 seconds. |
-++---------------------------+----------------------------------------------------------------------------------------------------+
-+| :class:`Transaction` | Tracks the state of an AMQP 1.0 local transaction. |
-++---------------------------+----------------------------------------------------------------------------------------------------+
-
- |
-
-@@ -25,18 +33,29 @@ Link Options
-
- The methods :meth:`Container.create_receiver` and :meth:`Container.create_sender` take one or more link options to allow the details of the links to be customized.
-
--.. autosummary::
-- LinkOption
-- ReceiverOption
-- SenderOption
-- AtLeastOnce
-- AtMostOnce
-- DynamicNodeProperties
-- Filter
-- Selector
-- DurableSubscription
-- Copy
-- Move
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`LinkOption` | Abstract interface for link configuration options. |
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`ReceiverOption` | Abstract class for receiver options. |
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`SenderOption` | Abstract class for sender options. |
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`AtLeastOnce` | Set at-least-once delivery semantics for message delivery. |
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`AtMostOnce` | Set at-most-once delivery semantics for message delivery. |
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`DynamicNodeProperties` | Allows a map of link properties to be set on a link. |
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`Filter` | Receiver option which allows incoming messages to be filtered. |
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`Selector` | Configures a receiver with a message selector filter. |
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`DurableSubscription` | Receiver option which sets both the configuration and delivery state to durable. |
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`Copy` | Receiver option which copies messages to the receiver. |
-++--------------------------------+----------------------------------------------------------------------------------+
-+| :class:`Move` | Receiver option which moves messages to the receiver (rather than copying). |
-++--------------------------------+----------------------------------------------------------------------------------+
-
- |
-
-diff --git a/python/docs/proton.rst b/python/docs/proton.rst
-index 2a92346..4dd1e2d 100644
---- a/python/docs/proton.rst
-+++ b/python/docs/proton.rst
-@@ -9,31 +9,57 @@ Module Summary
-
- |
-
--.. autosummary::
--
-- AnnotationDict
-- Condition
-- Connection
-- Data
-- Delivery
-- Disposition
-- Endpoint
-- Event
-- EventType
-- Link
-- Message
-- PropertyDict
-- Receiver
-- SASL
-- Sender
-- Session
-- SSL
-- SSLDomain
-- SSLSessionDetails
-- SymbolList
-- Terminus
-- Transport
-- Url
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`AnnotationDict` | A dictionary that only takes :class:`symbol` or :class:`ulong` types as a key. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Condition` | An AMQP Condition object. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Connection` | A representation of an AMQP connection. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Data` | Provides an interface for decoding, extracting, creating, and encoding arbitrary AMQP data. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Delivery` | Tracks and/or records the delivery of a message over a link. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Disposition` | A delivery state. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Endpoint` | Abstract class from which :class:`Connection`, :class:`Session` and :class:`Link` are derived, |
-+| | and which defines the state of these classes. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Event` | Notification of a state change in the protocol engine. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`EventType` | Connects an event number to an event name, and is used internally by :class:`Event` to represent|
-+| | all known event types. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Link` | A representation of an AMQP link (a unidirectional channel for transferring messages), of which |
-+| | there are two concrete implementations, :class:`Sender` and :class:`Receiver`. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Message` | A mutable holder of message content. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`PropertyDict` | A dictionary that only takes :class:`symbol` types as a key. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Receiver` | A link over which messages are received. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`SASL` | The SASL layer is responsible for establishing an authenticated and/or encrypted tunnel over |
-+| | which AMQP frames are passed between peers. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Sender` | A link over which messages are sent. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Session` | A container of links. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`SSL` | An SSL session associated with a transport. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`SSLDomain` | An SSL configuration domain, used to hold the SSL configuration for one or more SSL sessions. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`SSLSessionDetails` | Unique identifier for the SSL session. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`SymbolList` | A list that can only hold :class:`symbol` elements. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Terminus` | A source or target for messages. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Transport` | A network channel supporting an AMQP connection. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-+| :class:`Url` | **DEPRECATED** Simple URL parser/constructor. |
-++----------------------------+-------------------------------------------------------------------------------------------------+
-
- |
-
-@@ -42,19 +68,29 @@ Exceptions
-
- |
-
--.. autosummary::
--
-- ConnectionException
-- DataException
-- LinkException
-- MessageException
-- ProtonException
-- SessionException
-- SSLUnavailable
-- SSLException
-- Timeout
-- Interrupt
-- TransportException
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`ConnectionException` | An exception class raised when exceptions or errors related to a connection arise. |
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`DataException` | The DataException class is the root of the Data exception hierarchy. |
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`LinkException` | An exception class raised when exceptions or errors related to a link arise. |
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`MessageException` | The MessageException class is the root of the message exception hierarchy. |
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`ProtonException` | The root of the proton exception hierarchy. |
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`SessionException` | An exception class raised when exceptions or errors related to a session arise. |
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`SSLUnavailable` | An exception class raised when exceptions or errors related to SSL availability arise. |
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`SSLException` | An exception class raised when exceptions or errors related to SSL usage arise. |
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`Timeout` | A timeout exception indicates that a blocking operation has timed out. |
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`Interrupt` | An interrupt exception indicates that a blocking operation was interrupted. |
-++------------------------------+-----------------------------------------------------------------------------------------+
-+| :class:`TransportException` | An exception class raised when exceptions or errors related to the AMQP transport arise.|
-++------------------------------+-----------------------------------------------------------------------------------------+
-
- |
-
-@@ -63,25 +99,41 @@ AMQP Types
-
- |
-
--.. autosummary::
-- :nosignatures:
--
-- Array
-- byte
-- char
-- Described
-- decimal32
-- decimal64
-- decimal128
-- float32
-- int32
-- short
-- symbol
-- timestamp
-- ubyte
-- uint
-- ulong
-- ushort
-+Some AMQP types are represented by native Python types. See :ref:`types` for a full list of AMQP types.
-+
-++---------------------+------------------------------------------------------------+
-+| :class:`Array` | An AMQP array, a sequence of AMQP values of a single type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`byte` | The byte AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`char` | The char AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`Described` | A described AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`decimal32` | The decimal32 AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`decimal64` | The decimal64 AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`decimal128` | The decimal128 AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`float32` | The float AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`int32` | The signed int AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`short` | The short AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`symbol` | The symbol AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`timestamp` | The timestamp AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`ubyte` | The unsigned byte AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`uint` | The unsigned int AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`ulong` | The ulong AMQP type. |
-++---------------------+------------------------------------------------------------+
-+| :class:`ushort` | The unsigned short AMQP type. |
-++---------------------+------------------------------------------------------------+
-
- |
-
-diff --git a/python/docs/proton.utils.rst b/python/docs/proton.utils.rst
-index 8f2404d..219968a 100644
---- a/python/docs/proton.utils.rst
-+++ b/python/docs/proton.utils.rst
-@@ -9,11 +9,15 @@ Module Summary
-
- |
-
--.. autosummary::
-- BlockingConnection
-- BlockingSender
-- BlockingReceiver
-- SyncRequestResponse
-++------------------------------+-----------------------------------------------------------------------+
-+| :class:`BlockingConnection` | A synchronous style connection wrapper. |
-++------------------------------+-----------------------------------------------------------------------+
-+| :class:`BlockingSender` | A synchronous sender wrapper. |
-++------------------------------+-----------------------------------------------------------------------+
-+| :class:`BlockingReceiver` | A synchronous receiver wrapper. |
-++------------------------------+-----------------------------------------------------------------------+
-+| :class:`SyncRequestResponse` | Implementation of the synchronous request-response (aka RPC) pattern. |
-++------------------------------+-----------------------------------------------------------------------+
-
- |
-
-@@ -22,10 +26,15 @@ Exceptions
-
- |
-
--.. autosummary::
-- SendException
-- LinkDetached
-- ConnectionClosed
-++---------------------------+---------------------------------------------------------------------------------------------------+
-+| :class:`SendException` | Exception used to indicate an exceptional state/condition on a send request. |
-++---------------------------+---------------------------------------------------------------------------------------------------+
-+| :class:`LinkDetached` | The exception raised when the remote peer unexpectedly closes a link in a blocking context, or |
-+| | an unexpected link error occurs. |
-++---------------------------+---------------------------------------------------------------------------------------------------+
-+| :class:`ConnectionClosed` | The exception raised when the remote peer unexpectedly closes a connection in a blocking context, |
-+| | or an unexpected connection error occurs. |
-++---------------------------+---------------------------------------------------------------------------------------------------+
-
- |
-
---
-1.8.3.1
-
-From afa47527ea5fc01a7e8497779277c269930a5aa5 Mon Sep 17 00:00:00 2001
-From: Kim van der Riet
-Date: Tue, 10 Dec 2019 10:56:30 -0500
-Subject: [PATCH 2/2] Changed Sphinx invocation from sphinx to sphinx-build for
- RHEL7
-
----
- python/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
-index a396319..23c7eb4 100644
---- a/python/CMakeLists.txt
-+++ b/python/CMakeLists.txt
-@@ -127,7 +127,7 @@ else ()
- COMMAND ${PN_ENV_SCRIPT} --
- PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}
- LD_LIBRARY_PATH="${CMAKE_CURRENT_BINARY_DIR}/c"
-- ${PYTHON_EXECUTABLE} -m sphinx "${CMAKE_CURRENT_SOURCE_DIR}/docs" "${CMAKE_CURRENT_BINARY_DIR}/docs")
-+ sphinx-build "${CMAKE_CURRENT_SOURCE_DIR}/docs" "${CMAKE_CURRENT_BINARY_DIR}/docs")
- add_dependencies(docs docs-py)
- install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docs/"
- DESTINATION "${PROTON_SHARE}/docs/api-py"
---
-1.8.3.1
-
diff --git a/packages/qpid-proton/qpid-proton.spec b/packages/qpid-proton/qpid-proton.spec
deleted file mode 100644
index 5403ea4a..00000000
--- a/packages/qpid-proton/qpid-proton.spec
+++ /dev/null
@@ -1,595 +0,0 @@
-%global proton_datadir %{_datadir}/proton
-
-# per https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Preventing_files.2Fdirectories_from_being_scanned_for_deps_.28pre-scan_filtering.29
-%global __provides_exclude_from ^%{proton_datadir}/examples/.*$
-%global __requires_exclude_from ^%{proton_datadir}/examples/.*$
-
-%undefine __brp_mangle_shebangs
-
-Name: qpid-proton
-Version: 0.30.0
-Release: 2%{?dist}
-Group: System Environment/Libraries
-Summary: A high performance, lightweight messaging library
-License: ASL 2.0
-URL: http://qpid.apache.org/proton/
-
-Source0: %{name}-%{version}.tar.gz
-Patch0: proton.patch
-
-Source1: licenses.xml
-
-%global proton_licensedir %{_licensedir}/proton
-
-BuildRequires: gcc
-BuildRequires: gcc-c++
-BuildRequires: cmake
-BuildRequires: swig
-BuildRequires: pkgconfig
-BuildRequires: doxygen
-BuildRequires: python3-sphinx
-BuildRequires: libuuid-devel
-BuildRequires: openssl-devel
-BuildRequires: python3-devel
-BuildRequires: glibc-headers
-BuildRequires: cyrus-sasl-devel
-BuildRequires: jsoncpp-devel
-
-%description
-Proton is a high performance, lightweight messaging library. It can be used in
-the widest range of messaging applications including brokers, client libraries,
-routers, bridges, proxies, and more. Proton is based on the AMQP 1.0 messaging
-standard. Using Proton it is trivial to integrate with the AMQP 1.0 ecosystem
-from any platform, environment, or language.
-
-
-%package c
-Group: System Environment/Libraries
-Summary: C libraries for Qpid Proton
-Requires: cyrus-sasl-lib
-Obsoletes: qpid-proton
-
-%description c
-%{summary}.
-
-%files c
-%dir %{proton_datadir}
-%license %{proton_licensedir}/LICENSE.txt
-%license %{proton_licensedir}/licenses.xml
-%doc %{proton_datadir}/README*
-%{_libdir}/libqpid-proton.so.*
-%{_libdir}/libqpid-proton-core.so.*
-%{_libdir}/libqpid-proton-proactor.so.*
-
-%post c -p /sbin/ldconfig
-
-%postun c -p /sbin/ldconfig
-
-
-%package cpp
-Group: System Environment/Libraries
-Summary: C++ libraries for Qpid Proton
-Requires: qpid-proton-c%{?_isa} = %{version}-%{release}
-#Requires: jsoncpp
-%description cpp
-%{summary}.
-
-%files cpp
-%defattr(-,root,root,-)
-%dir %{proton_datadir}
-%license %{proton_licensedir}/LICENSE.txt
-%license %{proton_licensedir}/licenses.xml
-%doc %{proton_datadir}/README*
-%{_libdir}/libqpid-proton-cpp.so.*
-
-%post cpp -p /sbin/ldconfig
-
-%postun cpp -p /sbin/ldconfig
-
-
-%package c-devel
-Group: Development/System
-Requires: qpid-proton-c%{?_isa} = %{version}-%{release}
-Summary: Development libraries for writing messaging apps with Qpid Proton
-Obsoletes: qpid-proton-devel
-
-%description c-devel
-%{summary}.
-
-%files c-devel
-%{_includedir}/proton
-%exclude %{_includedir}/proton/*.hpp
-%exclude %{_includedir}/proton/**/*.hpp
-%{_libdir}/libqpid-proton.so
-%{_libdir}/libqpid-proton-core.so
-%{_libdir}/libqpid-proton-proactor.so
-%{_libdir}/pkgconfig/libqpid-proton.pc
-%{_libdir}/pkgconfig/libqpid-proton-core.pc
-%{_libdir}/pkgconfig/libqpid-proton-proactor.pc
-%{_libdir}/cmake/Proton
-
-
-%package cpp-devel
-Group: Development/System
-Requires: qpid-proton-cpp%{?_isa} = %{version}-%{release}
-Requires: qpid-proton-c-devel%{?_isa} = %{version}-%{release}
-Summary: Development libraries for writing messaging apps with Qpid Proton
-
-%description cpp-devel
-%{summary}.
-
-%files cpp-devel
-%{_includedir}/proton/*.hpp
-%{_includedir}/proton/**/*.hpp
-%{_libdir}/pkgconfig/libqpid-proton-cpp.pc
-%{_libdir}/libqpid-proton-cpp.so
-%{_libdir}/cmake/ProtonCpp
-
-
-%package c-docs
-Summary: Documentation for the C development libraries for Qpid Proton
-BuildArch: noarch
-Obsoletes: qpid-proton-c-devel-doc
-Obsoletes: qpid-proton-c-devel-docs
-
-%description c-docs
-%{summary}.
-
-%files c-docs
-%license %{proton_licensedir}/LICENSE.txt
-%license %{proton_licensedir}/licenses.xml
-%doc %{proton_datadir}/docs/api-c
-%doc %{proton_datadir}/examples/README.md
-%doc %{proton_datadir}/examples/c/ssl-certs
-%doc %{proton_datadir}/examples/c/*.c
-%doc %{proton_datadir}/examples/c/*.h
-%doc %{proton_datadir}/examples/c/README.dox
-%doc %{proton_datadir}/examples/c/CMakeLists.txt
-%doc %{proton_datadir}/examples/c/testme*
-
-
-%package cpp-docs
-Summary: Documentation for the C++ development libraries for Qpid Proton
-BuildArch: noarch
-Obsoletes: qpid-proton-cpp-devel-doc
-Obsoletes: qpid-proton-cpp-devel-docs
-
-%description cpp-docs
-%{summary}.
-
-%files cpp-docs
-%license %{proton_licensedir}/LICENSE.txt
-%license %{proton_licensedir}/licenses.xml
-%{proton_datadir}/docs/api-cpp
-%doc %{proton_datadir}/examples/cpp/*.cpp
-%doc %{proton_datadir}/examples/cpp/*.hpp
-%doc %{proton_datadir}/examples/cpp/README.dox
-%doc %{proton_datadir}/examples/cpp/CMakeLists.txt
-%doc %{proton_datadir}/examples/cpp/testme*
-%doc %{proton_datadir}/examples/cpp/ssl-certs
-%doc %{proton_datadir}/examples/cpp/tutorial.dox
-
-%package -n python3-qpid-proton
-Summary: Python language bindings for the Qpid Proton messaging framework
-%{?python_provide:%python_provide python3-qpid-proton}
-Requires: qpid-proton-c%{?_isa} = %{version}-%{release}
-Requires: python3
-
-%description -n python3-qpid-proton
-%{summary}.
-
-%files -n python3-qpid-proton
-%{python3_sitearch}/__pycache__/*
-%{python3_sitearch}/*.so
-%{python3_sitearch}/*.py*
-%{python3_sitearch}/*.egg-info
-%{python3_sitearch}/proton
-
-
-%package -n python-qpid-proton-docs
-Summary: Documentation for the Python language bindings for Qpid Proton
-BuildArch: noarch
-Obsoletes: python-qpid-proton-doc
-
-%description -n python-qpid-proton-docs
-%{summary}.
-
-%files -n python-qpid-proton-docs
-%license %{proton_licensedir}/LICENSE.txt
-%license %{proton_licensedir}/licenses.xml
-%doc %{proton_datadir}/docs/api-py
-%doc %{proton_datadir}/examples/python
-
-%package tests
-Group: Documentation
-Summary: Qpid Proton Tests
-BuildArch: noarch
-
-%description tests
-%{summary}.
-
-%files tests
-%defattr(-,root,root,-)
-%doc %{proton_datadir}/tests
-%exclude %{proton_datadir}/tests/py/*.pyo
-%exclude %{proton_datadir}/tests/py/*.pyc
-
-%prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1
-
-
-%build
-
-python_includes=$(ls -d /usr/include/python3.6*)
-python_lib=$(ls /usr/**/libpython3.6*.so)
-
-mkdir build; cd build
-
-%cmake \
- -DSYSINSTALL_BINDINGS=ON \
- -DCMAKE_SKIP_RPATH:BOOL=OFF \
- -DENABLE_FUZZ_TESTING=NO \
- "-DCMAKE_C_FLAGS=$CMAKE_C_FLAGS $CFLAGS -Wno-error=format-security" \
- "-DCMAKE_CXX_FLAGS=$CMAKE_CXX_FLAGS $CXXFLAGS -Wno-error=format-security" \
- "-DPYTHON_EXECUTABLE=%{__python3}" \
- "-DPYTHON_INCLUDE_DIR=$python_includes" \
- "-DPYTHON_LIBRARY=$python_lib" \
- ..
-#make all docs %{?_smp_mflags}
-make all docs -j1
-(cd python/dist; %py3_build)
-
-%install
-rm -rf %{buildroot}
-
-cd build
-%make_install
-(cd python/dist; %py3_install)
-
-chmod +x %{buildroot}%{python3_sitearch}/_cproton.so
-find %{buildroot}%{proton_datadir}/examples/python -name "*.py" -exec sed -i.original 's/!\/usr\/bin\/env python/!\/usr\/bin\/python3/' {} \;
-sed -i.original 's/!\/usr\/bin\/python/!\/usr\/bin\/python3/' %{buildroot}%{proton_datadir}/examples/c/testme
-sed -i.original 's/!\/usr\/bin\/python/!\/usr\/bin\/python3/' %{buildroot}%{proton_datadir}/examples/cpp/testme
-echo '#!/usr/bin/python3' > %{buildroot}%{proton_datadir}/examples/python/proton_server.py.original
-cat %{buildroot}%{proton_datadir}/examples/python/proton_server.py >> %{buildroot}%{proton_datadir}/examples/python/proton_server.py.original
-cp %{buildroot}%{proton_datadir}/examples/python/proton_server.py.original %{buildroot}%{proton_datadir}/examples/python/proton_server.py
-
-rm -f %{buildroot}%{proton_datadir}/examples/python/*.original
-rm -f %{buildroot}%{proton_datadir}/examples/c/*.original
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/*.original
-
-install -dm 755 %{buildroot}%{proton_licensedir}
-install -pm 644 %{SOURCE1} %{buildroot}%{proton_licensedir}
-install -pm 644 %{buildroot}%{proton_datadir}/LICENSE.txt %{buildroot}%{proton_licensedir}
-rm -f %{buildroot}%{proton_datadir}/LICENSE.txt
-
-# clean up files that are not shipped
-rm -rf %{buildroot}%{_exec_prefix}/bindings
-rm -rf %{buildroot}%{_libdir}/java
-rm -rf %{buildroot}%{_libdir}/libproton-jni.so
-rm -rf %{buildroot}%{_datarootdir}/java
-rm -rf %{buildroot}%{_libdir}/proton.cmake
-rm -rf %{buildroot}%{_libdir}/php
-rm -rf %{buildroot}%{_libdir}/ruby
-rm -rf %{buildroot}%{_datarootdir}/php
-rm -rf %{buildroot}%{_datarootdir}/ruby
-rm -rf %{buildroot}%{_sysconfdir}/php.d
-rm -fr %{buildroot}%{proton_datadir}/examples/CMakeFiles
-rm -f %{buildroot}%{proton_datadir}/examples/Makefile
-rm -f %{buildroot}%{proton_datadir}/examples/*.cmake
-rm -fr %{buildroot}%{proton_datadir}/examples/c/CMakeFiles
-rm -f %{buildroot}%{proton_datadir}/examples/c/*.cmake
-rm -f %{buildroot}%{proton_datadir}/examples/c/Makefile
-rm -f %{buildroot}%{proton_datadir}/examples/c/broker
-rm -f %{buildroot}%{proton_datadir}/examples/c/direct
-rm -f %{buildroot}%{proton_datadir}/examples/c/receive
-rm -f %{buildroot}%{proton_datadir}/examples/c/send
-rm -f %{buildroot}%{proton_datadir}/examples/c/send-abort
-rm -f %{buildroot}%{proton_datadir}/examples/c/send-ssl
-rm -fr %{buildroot}%{proton_datadir}/examples/cpp/CMakeFiles
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/*.cmake
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/Makefile
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/broker
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/client
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/connection_options
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/direct_recv
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/direct_send
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/encode_decode
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/flow_control
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/helloworld
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/helloworld_direct
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/queue_browser
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/scheduled_send_03
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/scheduled_send
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/selected_recv
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/server
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/server_direct
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/service_bus
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/simple_connect
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/simple_recv
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/simple_send
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/ssl
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/ssl_client_cert
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/message_properties
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/multithreaded_client
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/multithreaded_client_flow_control
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/reconnect_client
-rm -f %{buildroot}%{proton_datadir}/examples/cpp/colour_send
-rm -fr %{buildroot}%{proton_datadir}/examples/engine/java
-rm -fr %{buildroot}%{proton_datadir}/examples/go
-rm -fr %{buildroot}%{proton_datadir}/examples/java
-rm -fr %{buildroot}%{proton_datadir}/examples/javascript
-rm -fr %{buildroot}%{proton_datadir}/examples/ruby
-rm -fr %{buildroot}%{proton_datadir}/examples/perl
-rm -fr %{buildroot}%{proton_datadir}/examples/php
-rm -f %{buildroot}%{proton_datadir}/CMakeLists.txt
-
-%check
-
-%changelog
-* Fri Mar 20 2020 Irina Boverman - 0.30.0-2
-- Rebased to 0.30.0
-- Replaced epydoc with python3-sphinx
-
-* Wed Sep 18 2019 Irina Boverman - 0.29.0-1
-- Resolved PROTON-2092
-- Rebased to 0.29.0 rc1 upstream
-- Removed jsoncpp BuildRequires and Requires for now, there is no jsoncpp in EPEL 8
-
-* Tue May 7 2019 Irina Boverman - 0.28.0-1
-- Rebased to 0.28.0 rc1 upstream
-
-* Tue Apr 9 2019 Irina Boverman - 0.27.0-4
-- Added another patch to resolve ENTMQCL-1294
-
-* Mon Apr 1 2019 Irina Boverman - 0.27.0-3
-- Resolved: ENTMQCL-1294
-
-* Tue Feb 26 2019 Irina Boverman - 0.27.0-2
-- Resolved: ENTMQCL-753, ENTMQCL-1200
-
-* Wed Feb 6 2019 Irina Boverman - 0.27.0-1
-- Rebased to 0.27.0
-
-* Thu Dec 20 2018 Irina Boverman - 0.26.0-3
-- Added patch to resolve ENTMQCL-1121
-
-* Mon Nov 12 2018 Irina Boverman - 0.26.0-2
-- Added jsoncpp BuildRequires and Requires
-
-* Mon Oct 22 2018 Irina Boverman - 0.26.0-1
-- Rebased to 0.26.0
-
-* Tue Sep 11 2018 Irina Boverman - 0.25.0-1
-- Rebased to 0.25.0
-
-* Wed Jul 18 2018 Irina Boverman - 0.24.0-2
-- Resolved PROTON-1896/ENTMQCL-755
-
-* Mon Jul 2 2018 Irina Boverman - 0.24.0-1
-- Rebased to 0.24.0
-
-* Tue Jun 5 2018 Irina Boverman - 0.23.0-1
-- Rebased to 0.23.0
-
-* Mon Apr 2 2018 Irina Boverman - 0.22.0-2
-- Updated licenses.xml file
-
-* Mon Apr 2 2018 Irina Boverman - 0.22.0-1
-- Rebased to 0.22.0
-
-* Mon Mar 5 2018 Irina Boverman - 0.21.0-1
-- Rebased to 0.21.0
-
-* Wed Jan 31 2018 Irina Boverman - 0.20.0-2
-- Removed ruby files
-
-* Mon Jan 29 2018 Irina Boverman - 0.20.0-1
-- Rebased to 0.20.0
-
-* Tue Jan 16 2018 Irina Boverman - 0.18.1-2
-- Added fix for ENTMQCL-587
-- Removed fix for ENTMQCL-602
-
-* Mon Jan 8 2018 Irina Boverman - 0.18.1-1
-- Rebased to 0.18.1
-- Added fixes for ENTMQCL-589 and ENTMQCL-602
-
-* Tue Nov 28 2017 Irina Boverman - 0.18.0-6
-- Added fix for PROTON-1700
-
-* Wed Nov 8 2017 Irina Boverman - 0.18.0-5
-- Added fixes for PROTON-1678 and PROTON-1681
-
-* Wed Oct 18 2017 Irina Boverman - 0.18.0-4
-- Rebased to 0.18.0 rc1
-
-* Mon Oct 2 2017 Irina Boverman - 0.18.0-3
-- Added PROTON-1607 FIX
-
-* Mon Oct 2 2017 Irina Boverman - 0.18.0-2
-- Rebased to 0.18.0-beta upstream
-
-* Wed Sep 13 2017 Irina Boverman - 0.18.0-1
-- Rebased to 0.18.0 snapshot/commit c6d086
-
-* Wed Aug 23 2017 Mike Cressman - 0.16.0-7
-- Resolved: PROTON-1536, PROTON-1394/BZ-1318015, PROTON-1534/BZ-1319165
-
-* Tue Aug 22 2017 Irina Boverman - 0.16.0-6
-- Resolved: ENTMQCL-514, ENTMQCL-515, PROTON-1539
-
-* Thu Mar 9 2017 Irina Boverman - 0.16.0-3
-- Resolved: ENTMQCL-443, ENTMQCL-448
-
-* Wed Mar 1 2017 Irina Boverman - 0.16.0-2
-- Resolved: ENTMQCL-428, ENTMQCL-457, ENTMQCL-459, ENTMQCL-468, ENTMQCL-475
-
-* Thu Dec 8 2016 Irina Boverman - 0.16.0-1
-- Rebased to 0.16.0-rc1
-- Renamed sub-packages qpid-proton-c-devel-docs/qpid-proton-cpp-devel-docs
- to qpid-proton-c-docs/qpid-proton-cpp-docs
-- Removed binary and derived files from qpid-proton-cpp-docs package
-
-* Mon Aug 29 2016 Irina Boverman - 0.14.0-1
-- Rebased to 0.14.0
-
-* Wed Jun 22 2016 Irina Boverman - 0.13.0-5
-- Restored cyrus-sasl-devel dependency for non-Fedora builds
-
-* Fri Jun 17 2016 Irina Boverman - 0.13.0-4
-- Replaced "Provides" with "Obsoletes"
-
-* Wed Jun 15 2016 Irina Boverman - 0.13.0-2
-- Rebased to 0.13.0 GA version
-- Changed *doc to *docs, moved examples to *docs
-- Resolved ENTMQCL-367
-
-* Tue May 17 2016 Irina Boverman - 0.13.0-1
-- Rebased to 0.13.0 Beta
-
-* Wed Mar 23 2016 Irina Boverman - 0.12.1-1
-- Rebased to 0.12.1
-
-* Thu Feb 25 2016 Irina Boverman - 0.12.0-1
-- Rebased to 0.12.0
-- Added python3 installation
-
-* Thu Jan 21 2016 Irina Boverman - 0.11.1-1
-- Rebased to 0.11.1
-
-* Thu Dec 3 2015 Irina Boverman - 0.11.0-1
-- Rebased to 0.11.0
-
-* Thu Sep 3 2015 Irina Boverman - 0.10-2
-- Added dependency on cyrus-sasl-devel and cyrus-sasl-lib
-- Added 0001-PROTON-974-Accept-a-single-symbol-in-SASL-mechs-fram.patch
-
-* Mon Aug 17 2015 Irina Boverman - 0.10-1
-- Rebased to 0.10 proton release
-
-* Wed Jun 3 2015 Irina Boverman - 0.9-4
-- Added PROTON-858-fix-deletion-of-entries-from-map-to-.patch
-
-* Thu May 7 2015 Irina Boverman - 0.9-3
-- Rebased to 0.9.1 upstream
-
-* Tue Mar 31 2015 Irina Boverman - 0.9-2
-- Rebased to final 0.9 upstream
-
-* Tue Mar 3 2015 Irina Boverman - 0.9-1.20150223
-- Revised spec file to exclude generated and binary files from
- examples/c/messender directory
-
-* Mon Feb 23 2015 Irina Boverman - 0.9-1.20150223
-- Rebased to upstream snapshot 92d0499
-
-* Thu Feb 19 2015 Irina Boverman - 0.9-1.20150219
-- Removed perl examples
-
-* Wed Feb 18 2015 Irina Boverman - 0.9-1.20150218.1
-- Rebased to upstream snapshot ae49e3a
-
-* Fri Nov 7 2014 Irina Boverman - 0.7-5
-- Resolved: 1153769
-
-* Thu Sep 4 2014 Irina Boverman - 0.7-4
-- Resolved: 1126074
-
-* Fri Aug 1 2014 Irina Boverman - 0.7-3
-- Resolved: 1109320
-
-* Thu May 29 2014 Irina Boverman - 0.7-2
-- Add Visual-Studio-2008 patch
-
-* Thu May 1 2014 Irina Boverman - 0.7-1
-- Rebase to 0.7
-
-* Fri Apr 4 2014 Irina Boverman - 0.6-2
-- Added a patch to resolve bz 1077384
-
-* Thu Dec 19 2013 Irina Boverman - 0.6-1
-- Rebasing to 0.6-rc3
-
-* Fri Nov 15 2013 Irina Boverman - 0.5-9
-- Additional fixes for 1023639
-
-* Wed Nov 6 2013 Irina Boverman - 0.5-8
-- Resolved 1023639
-
-* Thu Sep 26 2013 Irina Boverman - 0.5-6
-- Added changes required to fix bz 995554
-
-* Mon Sep 23 2013 Irina Boverman - 0.5-5
-- Changed spec file to remove additional items
-
-* Thu Sep 19 2013 Irina Boverman - 0.5-4
-- Changed python-qpid-proton-doc sub-package to noarch
-
-* Tue Sep 17 2013 Irina Boverman - 0.5-3
-- Added qpid-proton-c-devel-doc/noarch package to resolve bz 1005058
-
-* Wed Aug 28 2013 Irina Boverman - 0.5-2
-- Built from mrg-messaging-3-rhel-6 branch
-
-* Wed Aug 28 2013 Irina Boverman - 0.5-1
-- Revised to Qpid Proton 0.5 version
-- Resolves bz: 1002290
-
-* Wed Apr 10 2013 Irina Boverman - 0.4-2.2
-- Initial packaging of the Qpid Proton for a product.
-
-* Fri Apr 5 2013 Darryl L. Pierce - 0.4-2.2
-- Added Obsoletes and Provides for packages whose names changed.
-- Resolves: BZ#948784
-
-* Mon Apr 1 2013 Darryl L. Pierce - 0.4-2.1
-- Fixed the dependencies for qpid-proton-devel and python-qpid-proton.
-
-* Thu Mar 28 2013 Darryl L. Pierce - 0.4-2
-- Moved all C libraries to the new qpid-proton-c subpackage.
-
-* Wed Mar 13 2013 Darryl L. Pierce - 0.4-1
-- Rebased on Proton 0.4.
-- On EL6 BR pulls in Cmake 2.8 on PPC/PPC64.
-
-* Thu Feb 21 2013 Darryl L. Pierce - 0.3-4
-- Fixes copying nested data.
-- PROTON-246, PROTON-230
-
-* Mon Jan 28 2013 Darryl L. Pierce - 0.3-3
-- Fixes build failure on non-x86 platforms.
-- Resolves: BZ#901526
-
-* Fri Jan 25 2013 Darryl L. Pierce - 0.3-2
-- Fixes build failure on non-x86 platforms.
-- Resolves: BZ#901526
-
-* Wed Jan 16 2013 Darryl L. Pierce - 0.3-1
-- Rebased on Proton 0.3.
-
-* Fri Dec 28 2012 Darryl L. Pierce - 0.2-2.4
-- Moved ownership of the docs dir to the docs package.
-
-* Wed Dec 19 2012 Darryl L. Pierce - 0.2-2.3
-- Fixed package dependencies, adding the release macro.
-
-* Mon Dec 17 2012 Darryl L. Pierce - 0.2-2.2
-- Fixed subpackage dependencies on main package.
-- Removed accidental ownership of /usr/include.
-
-* Thu Dec 13 2012 Darryl L. Pierce - 0.2-2.1
-- Remove BR for ruby-devel.
-- Removed redundant package name from summary.
-- Removed debugging artifacts from specfile.
-- Moved unversioned library to the -devel package.
-- Added dependency on main package to -devel.
-- Fixed directory ownerships.
-
-* Fri Nov 30 2012 Darryl L. Pierce - 0.2-2
-- Removed BR on help2man.
-- Added patch for generated manpage.
-
-* Mon Nov 5 2012 Darryl L. Pierce - 0.2-1
-- Initial packaging of the Qpid Proton.
diff --git a/packages/qpid-proton/sources b/packages/qpid-proton/sources
deleted file mode 100644
index f38f4b0f..00000000
--- a/packages/qpid-proton/sources
+++ /dev/null
@@ -1 +0,0 @@
-0e55d6a2c9803ef72604c50c7b934379092680b5edd52e3641a851f50ba1136bfa83cd30328d2b3235152331109d3204aa32168aa626d6e8e34a590d82553cc8 qpid-proton-0.30.0.tar.gz
diff --git a/rpm_spec/subpackages/manageiq-core b/rpm_spec/subpackages/manageiq-core
index d4d71271..70f1d400 100644
--- a/rpm_spec/subpackages/manageiq-core
+++ b/rpm_spec/subpackages/manageiq-core
@@ -1,7 +1,7 @@
%package core
Summary: %{product_summary} Core
-Requires: ruby >= 3
+Requires: ruby >= 3.1
# Include weak dependencies of Ruby that we actually need
Requires: ruby-default-gems
Requires: rubygem-bigdecimal
diff --git a/rpm_spec/subpackages/manageiq-gemset b/rpm_spec/subpackages/manageiq-gemset
index 9ae80a23..bc61af31 100644
--- a/rpm_spec/subpackages/manageiq-gemset
+++ b/rpm_spec/subpackages/manageiq-gemset
@@ -30,7 +30,7 @@ Requires: python3-pylxca
Requires: cyrus-sasl
Requires: cyrus-sasl-plain
Requires: python3-vspk
-Requires: qpid-proton-c
+Requires: qpid-proton-c >= 0.37.0
# For Appliance Console
Requires: libsodium-devel