Hello community, here is the log from the commit of package qpid-proton for openSUSE:Factory checked in at 2017-08-24 18:05:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qpid-proton (Old) and /work/SRC/openSUSE:Factory/.qpid-proton.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qpid-proton" Thu Aug 24 18:05:41 2017 rev:9 rq:518054 version:0.17.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qpid-proton/qpid-proton.changes 2017-08-12 20:00:36.635575236 +0200 +++ /work/SRC/openSUSE:Factory/.qpid-proton.new/qpid-proton.changes 2017-08-24 18:05:42.311987387 +0200 @@ -1,0 +2,5 @@ +Fri Aug 18 04:11:59 UTC 2017 - [email protected] + +- Add qpid-proton-cmake-fixes.patch to fix build + +------------------------------------------------------------------- New: ---- qpid-proton-cmake-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qpid-proton.spec ++++++ --- /var/tmp/diff_new_pack.xW9rMA/_old 2017-08-24 18:05:43.319845485 +0200 +++ /var/tmp/diff_new_pack.xW9rMA/_new 2017-08-24 18:05:43.331843796 +0200 @@ -25,8 +25,9 @@ Group: Productivity/Networking/Other Url: http://qpid.apache.org/proton/ Source0: http://www.apache.org/dist/qpid/proton/%{version}/%{name}-%{version}.tar.gz -Patch101: qpid-proton-0.9-pthread.patch -Patch102: qpid-proton-0.16.0-gcc7.patch +Patch101: qpid-proton-cmake-fixes.patch +Patch102: qpid-proton-0.9-pthread.patch +Patch103: qpid-proton-0.16.0-gcc7.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: epydoc @@ -174,8 +175,7 @@ %prep %setup -q -%patch101 -p1 -%patch102 -p1 +%autopatch -p1 %build %cmake \ ++++++ qpid-proton-0.9-pthread.patch ++++++ --- /var/tmp/diff_new_pack.xW9rMA/_old 2017-08-24 18:05:43.415831971 +0200 +++ /var/tmp/diff_new_pack.xW9rMA/_new 2017-08-24 18:05:43.415831971 +0200 @@ -1,11 +1,13 @@ ---- qpid-proton-0.9/proton-c/bindings/perl/CMakeLists.txt 2015-03-31 11:07:22.000000000 +0200 -+++ qpid-proton-0.9/proton-c/bindings/perl/CMakeLists.txt 2015-04-09 09:15:39.519811047 +0200 -@@ -52,7 +52,7 @@ - ${PROTON_HEADERS} - ) - swig_add_module(cproton_perl perl perl.i) +Index: qpid-proton-0.17.0/proton-c/bindings/perl/CMakeLists.txt +=================================================================== +--- qpid-proton-0.17.0.orig/proton-c/bindings/perl/CMakeLists.txt ++++ qpid-proton-0.17.0/proton-c/bindings/perl/CMakeLists.txt +@@ -58,7 +58,7 @@ if ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND + else() + swig_add_library(cproton_perl LANGUAGE perl SOURCES perl.i) + endif ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) -swig_link_libraries(cproton_perl ${BINDING_DEPS} ${PERL_LIBRARY}) +swig_link_libraries(cproton_perl ${BINDING_DEPS} ${PERL_LIBRARY} -lpthread -lm) - if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton_perl.so + if (((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) OR + ((${CMAKE_MAJOR_VERSION} GREATER 2) AND (${CMAKE_MINOR_VERSION} GREATER 8))) ++++++ qpid-proton-cmake-fixes.patch ++++++ Index: qpid-proton-0.17.0/proton-c/bindings/node/CMakeLists.txt =================================================================== --- qpid-proton-0.17.0.orig/proton-c/bindings/node/CMakeLists.txt +++ qpid-proton-0.17.0/proton-c/bindings/node/CMakeLists.txt @@ -57,7 +57,11 @@ include_directories("${NODE_ROOT_DIR}/de set(CMAKE_CXX_CREATE_SHARED_MODULE ${CMAKE_CXX_CREATE_SHARED_LIBRARY}) set(CMAKE_SWIG_FLAGS "-node;-I${CMAKE_CURRENT_SOURCE_DIR}/../../include") set_source_files_properties(javascript.i PROPERTIES CPLUSPLUS ON) -swig_add_module(cproton javascript javascript.i) +if ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) + swig_add_module(cproton javascript javascript.i) +else() + swig_add_library(cproton LANGUAGE javascript SOURCES javascript.i) +endif ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) set_target_properties (cproton PROPERTIES LINKER_LANGUAGE CXX) list(APPEND SWIG_MODULE_cproton_javascript_EXTRA_DEPS ${CMAKE_CURRENT_SOURCE_DIR}/../../proton-c/include/proton/cproton.i Index: qpid-proton-0.17.0/proton-c/bindings/perl/CMakeLists.txt =================================================================== --- qpid-proton-0.17.0.orig/proton-c/bindings/perl/CMakeLists.txt +++ qpid-proton-0.17.0/proton-c/bindings/perl/CMakeLists.txt @@ -53,10 +53,15 @@ list(APPEND SWIG_MODULE_cproton_perl_EXT ${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i ${PROTON_HEADERS} ) -swig_add_module(cproton_perl perl perl.i) +if ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) + swig_add_module(cproton_perl perl perl.i) +else() + swig_add_library(cproton_perl LANGUAGE perl SOURCES perl.i) +endif ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) swig_link_libraries(cproton_perl ${BINDING_DEPS} ${PERL_LIBRARY}) -if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) +if (((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) OR + ((${CMAKE_MAJOR_VERSION} GREATER 2) AND (${CMAKE_MINOR_VERSION} GREATER 8))) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton_perl.so DESTINATION ${PERL_VENDORARCH_DIR}/auto/cproton_perl COMPONENT Perl @@ -67,7 +72,8 @@ else() DESTINATION ${PERL_VENDORARCH_DIR}/auto/cproton_perl COMPONENT Perl ) -endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) +endif (((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) OR + ((${CMAKE_MAJOR_VERSION} GREATER 2) AND (${CMAKE_MINOR_VERSION} GREATER 8))) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cproton_perl.pm DESTINATION ${PERL_VENDORARCH_DIR} Index: qpid-proton-0.17.0/proton-c/bindings/php/CMakeLists.txt =================================================================== --- qpid-proton-0.17.0.orig/proton-c/bindings/php/CMakeLists.txt +++ qpid-proton-0.17.0/proton-c/bindings/php/CMakeLists.txt @@ -34,7 +34,11 @@ list(APPEND SWIG_MODULE_cproton_EXTRA_DE ${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i ${PROTON_HEADERS} ) -swig_add_module(cproton php ${CMAKE_CURRENT_SOURCE_DIR}/php.i) +if ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) + swig_add_module(cproton php ${CMAKE_CURRENT_SOURCE_DIR}/php.i) +else () + swig_add_library(cproton LANGUAGE php SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/php.i) +endif ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${PHP_INCLUDES}") swig_link_libraries(cproton ${BINDING_DEPS}) # PHP modules must be linked with unresolved symbols as they are presumably satisfied only when loaded by php itself Index: qpid-proton-0.17.0/proton-c/bindings/python/CMakeLists.txt =================================================================== --- qpid-proton-0.17.0.orig/proton-c/bindings/python/CMakeLists.txt +++ qpid-proton-0.17.0/proton-c/bindings/python/CMakeLists.txt @@ -39,8 +39,11 @@ list(APPEND SWIG_MODULE_cproton_EXTRA_DE ${CMAKE_SOURCE_DIR}/proton-c/include/proton/cproton.i ${PROTON_HEADERS} ) - -swig_add_module(cproton python cproton.i) +if ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) + swig_add_module(cproton python cproton.i) +else () + swig_add_library(cproton LANGUAGE python SOURCES cproton.i) +endif ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) swig_link_libraries(cproton ${BINDING_DEPS} ${PYTHON_LIBRARIES}) set_target_properties(${SWIG_MODULE_cproton_REAL_NAME} PROPERTIES Index: qpid-proton-0.17.0/proton-c/bindings/ruby/CMakeLists.txt =================================================================== --- qpid-proton-0.17.0.orig/proton-c/bindings/ruby/CMakeLists.txt +++ qpid-proton-0.17.0/proton-c/bindings/ruby/CMakeLists.txt @@ -26,7 +26,11 @@ list(APPEND SWIG_MODULE_cproton-ruby_EXT ) include_directories (${RUBY_INCLUDE_PATH}) -swig_add_module(cproton-ruby ruby ruby.i) +if ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) + swig_add_module(cproton-ruby ruby ruby.i) +else () + swig_add_library(cproton-ruby LANGUAGE ruby SOURCES ruby.i) +endif ((${CMAKE_MAJOR_VERSION} EQUAL 3) AND (${CMAKE_MINOR_VERSION} LESS 7)) swig_link_libraries(cproton-ruby ${BINDING_DEPS} ${RUBY_LIBRARY}) # set a compiler macro to relay the Ruby version to the extension.
