diff --git a/preliminary.patch b/0001-PROTON-1526-Ensure-the-module-.so-file-has-no-prefix.patch similarity index 64% rename from preliminary.patch rename to 0001-PROTON-1526-Ensure-the-module-.so-file-has-no-prefix.patch index 594ff80..25cd57f 100644 --- a/preliminary.patch +++ b/0001-PROTON-1526-Ensure-the-module-.so-file-has-no-prefix.patch @@ -1,9 +1,22 @@ +From 1b8dae76d36167b9f3e0748968d9b6ee1da3bc20 Mon Sep 17 00:00:00 2001 +From: Justin Ross +Date: Tue, 8 Aug 2017 13:58:38 -0700 +Subject: [PATCH] PROTON-1526: Ensure the module .so file has no prefix; remove + version-based rename + +--- + proton-c/bindings/perl/CMakeLists.txt | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) + diff --git a/proton-c/bindings/perl/CMakeLists.txt b/proton-c/bindings/perl/CMakeLists.txt -index 1356ccea..ed61d864 100644 +index 1356cce..744e812 100644 --- a/proton-c/bindings/perl/CMakeLists.txt +++ b/proton-c/bindings/perl/CMakeLists.txt -@@ -56,18 +56,9 @@ list(APPEND SWIG_MODULE_cproton_perl_EXTRA_DEPS +@@ -54,20 +54,12 @@ list(APPEND SWIG_MODULE_cproton_perl_EXTRA_DEPS + ${PROTON_HEADERS} + ) swig_add_module(cproton_perl perl perl.i) ++set_target_properties(cproton_perl PROPERTIES PREFIX "") swig_link_libraries(cproton_perl ${BINDING_DEPS} ${PERL_LIBRARY}) -if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) @@ -23,3 +36,6 @@ index 1356ccea..ed61d864 100644 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton_perl.pm DESTINATION ${PERL_VENDORARCH_DIR} +-- +1.8.3.1 + diff --git a/qpid-proton.spec b/qpid-proton.spec index d0cc411..40049be 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -58,7 +58,7 @@ BuildRequires: perl(Test::More) BuildRequires: cyrus-sasl-devel Patch0: 0001-PROTON-1466-proton-c-mixing-up-links-with-names-that.patch -Patch1: preliminary.patch +Patch1: 0001-PROTON-1526-Ensure-the-module-.so-file-has-no-prefix.patch %description Proton is a high performance, lightweight messaging library. It can be used in @@ -403,7 +403,7 @@ popd %changelog * Tue Aug 8 2017 Irina Boverman - 0.17.0-6 - Added missing *.hpp files in qpid-proton-cpp-devel package -- Added preliminary patch to resolve install issue +- Resolves: PROTON-1526 * Fri Jul 07 2017 Igor Gnatenko - 0.17.0-5 - Rebuild due to bug in RPM (RHBZ #1468476)