[rpms/qpid-proton] epel10: Reverts the patch.

[Hirotaka Wakabayashi <hiwkby@yahoo.com>]

A new commit has been pushed.

Repo   : rpms/qpid-proton
Branch : epel10
Commit : a610b838f5e61263b8e48d73aee72347819b24af
Author : Hirotaka Wakabayashi <hiwkby@yahoo.com>
Date   : 2026-08-27T11:29:47+00:00
Stats  : +6/-184 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/qpid-proton/c/a610b838f5e61263b8e48d73aee72347819b24af?branch=epel10

Log:
Reverts the patch.

---
diff --git a/proton.patch b/proton.patch
index bc1640b..e686f52 100644
--- a/proton.patch
+++ b/proton.patch
@@ -17,32 +17,7 @@ diff -rc qpid-proton-0.40.0.orig/CMakeLists.txt qpid-proton-0.40.0/CMakeLists.tx
 ! find_package(Python 3.12
           REQUIRED COMPONENTS Interpreter
           OPTIONAL_COMPONENTS Development)
-
-diff -c qpid-proton-0.40.0/cpp/src/ssl_options.cpp.orig qpid-proton-0.40.0/cpp/src/ssl_options.cpp
-*** qpid-proton-0.40.0/cpp/src/ssl_options.cpp.orig	Fri Jan 24 08:53:42 2025
---- qpid-proton-0.40.0/cpp/src/ssl_options.cpp	Fri Jan 24 08:53:03 2025
-***************
-*** 22,28 ****
-  #include "ssl_options_impl.hpp"
-  
-  // https://stackoverflow.com/questions/31657499/how-to-detect-stdlib-libc-in-the-preprocessor
-! #include <ciso646>
-  
-  #include "proton/ssl.hpp"
-  #include "proton/error.hpp"
---- 22,32 ----
-  #include "ssl_options_impl.hpp"
   
-  // https://stackoverflow.com/questions/31657499/how-to-detect-stdlib-libc-in-the-preprocessor
-! #if (__cplusplus >= 201103L)
-! #  include <version>
-! #else
-! #  include <ciso646>
-! #endif
-  
-  #include "proton/ssl.hpp"
-  #include "proton/error.hpp"
-
 diff -rc qpid-proton-0.40.0.orig/python/CMakeLists.txt qpid-proton-0.40.0/python/CMakeLists.txt
 *** qpid-proton-0.40.0.orig/python/CMakeLists.txt	Fri Nov 29 12:08:10 2024
 --- qpid-proton-0.40.0/python/CMakeLists.txt	Fri Nov 29 12:09:04 2024
@@ -63,103 +38,3 @@ diff -rc qpid-proton-0.40.0.orig/python/CMakeLists.txt qpid-proton-0.40.0/python
       add_dependencies(docs docs-py)
       install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docs/"
               DESTINATION "${PROTON_SHARE}/docs/api-py"
-
-diff -rc qpid-proton-0.40.0/c/src/ssl/openssl.c qpid-proton-0.40.0.new/c/src/ssl/openssl.c
-*** qpid-proton-0.40.0/c/src/ssl/openssl.c	Wed Nov 20 17:19:36 2024
---- qpid-proton-0.40.0.new/c/src/ssl/openssl.c	Fri Aug  7 07:36:26 2026
-***************
-*** 339,345 ****
-        GENERAL_NAME *name = sk_GENERAL_NAME_value( sans, i );
-        if (name->type == GEN_DNS) {
-          ASN1_STRING *asn1 = name->d.dNSName;
-!         if (asn1 && asn1->data && asn1->length) {
-            unsigned char *str;
-            int len = ASN1_STRING_to_UTF8( &str, asn1 );
-            if (len >= 0) {
---- 339,345 ----
-        GENERAL_NAME *name = sk_GENERAL_NAME_value( sans, i );
-        if (name->type == GEN_DNS) {
-          ASN1_STRING *asn1 = name->d.dNSName;
-!         if (asn1 && ASN1_STRING_get0_data(asn1) && ASN1_STRING_length(asn1) > 0){
-            unsigned char *str;
-            int len = ASN1_STRING_to_UTF8( &str, asn1 );
-            if (len >= 0) {
-***************
-*** 354,364 ****
-    }
-  
-    /* if no general names match, try the CommonName from the subject */
-!   X509_NAME *name = X509_get_subject_name(cert);
-    int i = -1;
-    while (!matched && (i = X509_NAME_get_index_by_NID(name, NID_commonName, i)) >= 0) {
-!     X509_NAME_ENTRY *ne = X509_NAME_get_entry(name, i);
-!     ASN1_STRING *name_asn1 = X509_NAME_ENTRY_get_data(ne);
-      if (name_asn1) {
-        unsigned char *str;
-        int len = ASN1_STRING_to_UTF8( &str, name_asn1);
---- 354,364 ----
-    }
-  
-    /* if no general names match, try the CommonName from the subject */
-!   const X509_NAME *name = X509_get_subject_name(cert);
-    int i = -1;
-    while (!matched && (i = X509_NAME_get_index_by_NID(name, NID_commonName, i)) >= 0) {
-!     const X509_NAME_ENTRY *ne = X509_NAME_get_entry(name, i);
-!     const ASN1_STRING *name_asn1 = X509_NAME_ENTRY_get_data(ne);
-      if (name_asn1) {
-        unsigned char *str;
-        int len = ASN1_STRING_to_UTF8( &str, name_asn1);
-***************
-*** 1558,1564 ****
-    if (!ssl->subject) {
-      X509 *cert = get_peer_certificate(ssl);
-      if (!cert) return NULL;
-!     X509_NAME *subject = X509_get_subject_name(cert);
-      if (!subject) return NULL;
-  
-      BIO *out = BIO_new(BIO_s_mem());
---- 1558,1564 ----
-    if (!ssl->subject) {
-      X509 *cert = get_peer_certificate(ssl);
-      if (!cert) return NULL;
-!     const X509_NAME *subject = X509_get_subject_name(cert);
-      if (!subject) return NULL;
-  
-      BIO *out = BIO_new(BIO_s_mem());
-***************
-*** 1677,1693 ****
-    X509 *cert = get_peer_certificate(ssl);
-    if (!cert) return NULL;
-  
-!   X509_NAME *subject_name = X509_get_subject_name(cert);
-  
-    // TODO (gmurthy) - A server side cert subject field can have more than one common name like this - Subject: CN=www.domain1.com, CN=www.domain2.com, see https://bugzilla.mozilla.org/show_bug.cgi?id=380656
-    // For now, we will only return the first common name if there is more than one common name in the cert
-    int index = X509_NAME_get_index_by_NID(subject_name, openssl_field, -1);
-  
-    if (index > -1) {
-!     X509_NAME_ENTRY *ne = X509_NAME_get_entry(subject_name, index);
-      if(ne) {
-!       ASN1_STRING *name_asn1 = X509_NAME_ENTRY_get_data(ne);
-!       return (char *) name_asn1->data;
-      }
-    }
-  
---- 1677,1693 ----
-    X509 *cert = get_peer_certificate(ssl);
-    if (!cert) return NULL;
-  
-!   const X509_NAME *subject_name = X509_get_subject_name(cert);
-  
-    // TODO (gmurthy) - A server side cert subject field can have more than one common name like this - Subject: CN=www.domain1.com, CN=www.domain2.com, see https://bugzilla.mozilla.org/show_bug.cgi?id=380656
-    // For now, we will only return the first common name if there is more than one common name in the cert
-    int index = X509_NAME_get_index_by_NID(subject_name, openssl_field, -1);
-  
-    if (index > -1) {
-!     const X509_NAME_ENTRY *ne = X509_NAME_get_entry(subject_name, index);
-      if(ne) {
-!       const ASN1_STRING *name_asn1 = X509_NAME_ENTRY_get_data(ne);
-!       return (const char *)ASN1_STRING_get0_data(name_asn1);
-      }
-    }
-  

diff --git a/qpid-proton.spec b/qpid-proton.spec
index 1da6c20..b8f56ff 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -6,11 +6,9 @@
 
 %undefine __brp_mangle_shebangs
 
-%global _cmake_generator "Unix Makefiles"
-
 Name:           qpid-proton
 Version:        0.40.0
-Release:        20%{?dist}
+Release:        4%{?dist}
 Summary:        A high performance, lightweight messaging library
 # Automatically converted from old format: ASL 2.0 - review is highly recommended.
 License:        Apache-2.0
@@ -35,7 +33,6 @@ BuildRequires:  cyrus-sasl-plain
 BuildRequires:  cyrus-sasl-md5
 BuildRequires:  doxygen
 BuildRequires:  jsoncpp-devel
-BuildRequires:  pyproject-rpm-macros
 BuildRequires:  python3-devel
 BuildRequires:  python3-build
 BuildRequires:  python3-cffi
@@ -174,7 +171,6 @@ Obsoletes: qpid-proton-cpp-devel-docs
 Summary:  Python language bindings for the Qpid Proton messaging framework
 Requires: qpid-proton-c%{?_isa} = %{version}-%{release}
 Requires: python3
-Provides: python%{python3_version}dist(python-%name)
 
 %description -n python3-qpid-proton
 %{summary}.
@@ -239,9 +235,8 @@ cd BLD
 # so that we rebuild from scratch
 rm -rf build
 %global whl_tags cp%{python3_version_nodots}-cp%{python3_version_nodots}-%(echo %{python3_platform} | tr -- - _)
-%global _pyproject_wheeldir %{buildroot}/../qpid-proton-%{version}/BLD/python/dist
 cd ..
-%pyproject_install
+%py3_install_wheel python_qpid_proton-%{version}-%{whl_tags}.whl
 # We seem to need to strip the build extension otherwise it seems to embed a reference to
 # the buildroot in the debug info which fails the rpmbuild - probably because we massaged
 # the pkgconfig path above
@@ -314,59 +309,11 @@ rm -f  %{buildroot}%{proton_datadir}/CMakeLists.txt
 %check
 
 %changelog
-* Thu Aug 27 2026 Hirotaka Wakabayashi <hiwkby@yahoo.com> - 0.40.0-20
-- Fix EPEL build by yselkowitz.
-
-* Fri Aug 07 2026 Hirotaka Wakabayashi <hiwkby@yahoo.com> - 0.40.0-19
-- Resolves: PROTON-2937 for OpenSSL 4
-
-* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 0.40.0-17
-- Rebuilt for openssl 4.0
-
-* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 0.40.0-16
-- Rebuilt for Python 3.15
-
-* Sat May 02 2026 Hirotaka Wakabayashi <hiwkby@yahoo.com> - 0.40.0-15
-- Apply patch by churchyard to opt-out of the ninja generator.
-
-* Sun Mar 22 2026 Björn Esser <besser82@fedoraproject.org> - 0.40.0-14
-- Rebuild (jsoncpp)
-
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 0.40.0-12
-- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Thu Aug 28 2025 Hirotaka Wakabayashi <hiwkby@yahoo.com> - 0.40.0-11
-- Migrated the old macro
-
-* Thu Aug 28 2025 Hirotaka Wakabayashi <hiwkby@yahoo.com> - 0.40.0-10
-- Migrated the old macro
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 0.40.0-9
-- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 0.40.0-7
-- Rebuilt for Python 3.14
-
-* Thu Feb 27 2025 Björn Esser <besser82@fedoraproject.org> - 0.40.0-6
-- Rebuild (jsoncpp)
-
-* Fri Jan 24 2025 Hirotaka Wakabayashi <hiwkby@yahoo.com> - 0.40.0-5
-- Add the warning workaround for std=++17 build flag.
-
-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.40.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+* Thu Dec 05 2024 Hirotaka Wakabayashi <hiwkby@yahoo.com> - 0.40.0-4
+- Update release version to prevent NVR check error
 
-* Thu Jan 16 2025 Hirotaka Wakabayashi <hiwkby@yahoo.com> - 0.40.0-3
-- Fix Automatic Python Provides(rhbz#2243262)
+* Thu Dec 05 2024 Hirotaka Wakabayashi <hiwkby@yahoo.com> - 0.40.0-3
+- Downgrade Python version
 
 * Wed Dec 04 2024 Hirotaka Wakabayashi <hiwkby@yahoo.com> - 0.40.0-2
 - Update licenses.xml