From 2aa95cca7f78c1b55e08f12e5a8afd4a9818823a Mon Sep 17 00:00:00 2001 From: Irina Boverman Date: Tue, 8 Aug 2017 20:52:47 -0400 Subject: [PATCH] 0.17.0-6 --- preliminary.patch | 25 +++++++++++++++++++++++++ qpid-proton.spec | 13 +++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 preliminary.patch diff --git a/preliminary.patch b/preliminary.patch new file mode 100644 index 0000000..594ff80 --- /dev/null +++ b/preliminary.patch @@ -0,0 +1,25 @@ +diff --git a/proton-c/bindings/perl/CMakeLists.txt b/proton-c/bindings/perl/CMakeLists.txt +index 1356ccea..ed61d864 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 + swig_add_module(cproton_perl perl perl.i) + swig_link_libraries(cproton_perl ${BINDING_DEPS} ${PERL_LIBRARY}) + +-if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton_perl.so ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton_perl.so + DESTINATION ${PERL_VENDORARCH_DIR}/auto/cproton_perl +- COMPONENT Perl +- ) +-else() +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcproton_perl.so +- RENAME cproton_perl.so +- DESTINATION ${PERL_VENDORARCH_DIR}/auto/cproton_perl +- COMPONENT Perl +- ) +-endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) ++ COMPONENT Perl) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton_perl.pm + DESTINATION ${PERL_VENDORARCH_DIR} diff --git a/qpid-proton.spec b/qpid-proton.spec index 5cd0154..d0cc411 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -17,7 +17,7 @@ Name: qpid-proton Version: 0.17.0 -Release: 7%{?dist} +Release: 6%{?dist} Group: System Environment/Libraries Summary: A high performance, lightweight messaging library @@ -58,6 +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 %description Proton is a high performance, lightweight messaging library. It can be used in @@ -274,6 +275,7 @@ Requires: qpid-proton-c = %{version}-%{release} %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 %build @@ -399,14 +401,9 @@ popd %endif %changelog -* Thu Aug 03 2017 Fedora Release Engineering - 0.17.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Mon Jul 31 2017 Irina Boverman - 0.17.0-6 +* Tue Aug 8 2017 Irina Boverman - 0.17.0-6 - Added missing *.hpp files in qpid-proton-cpp-devel package - -* Thu Jul 27 2017 Fedora Release Engineering - 0.17.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +- Added preliminary patch to resolve install issue * Fri Jul 07 2017 Igor Gnatenko - 0.17.0-5 - Rebuild due to bug in RPM (RHBZ #1468476)