Hello community, here is the log from the commit of package openwsman for openSUSE:Factory checked in at 2013-09-12 14:33:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openwsman (Old) and /work/SRC/openSUSE:Factory/.openwsman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openwsman" Changes: -------- --- /work/SRC/openSUSE:Factory/openwsman/openwsman.changes 2013-09-11 12:59:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openwsman.new/openwsman.changes 2013-09-12 14:33:37.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 11 08:19:40 UTC 2013 - kkae...@suse.com + +- Update to 2.4.1 + - Fix build for SLE11, Fedora 18 & 19 + - Fix build time test library path + - include version.rb into ruby gem (fixes issue #18) + +------------------------------------------------------------------- Old: ---- openwsman-2.4.0.tar.bz2 New: ---- openwsman-2.4.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openwsman.spec ++++++ --- /var/tmp/diff_new_pack.XPKP53/_old 2013-09-12 14:33:38.000000000 +0200 +++ /var/tmp/diff_new_pack.XPKP53/_new 2013-09-12 14:33:38.000000000 +0200 @@ -62,6 +62,10 @@ %endif %endif +%if 0%{?fedora} == 19 +BuildRequires: rubypick +%endif + %if 0%{?fedora} > 0 || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 BuildRequires: perl-devel %endif @@ -110,7 +114,7 @@ %endif Requires(pre): sed coreutils grep /bin/hostname -Version: 2.4.0 +Version: 2.4.1 Release: 0 # Mandriva: # Release %mkrel 1 @@ -206,7 +210,13 @@ %package ruby Requires: ruby + +# RbConfig::CONFIG["ruby_version"] is empty in Fedora 19 !? +%if 0%{?fedora} == 19 +%{!?ruby_version: %global ruby_version %(ruby -r rbconfig -e 'print(RbConfig::CONFIG["RUBY_PROGRAM_VERSION"])')} +%else %{!?ruby_version: %global ruby_version %(ruby -r rbconfig -e 'print(RbConfig::CONFIG["ruby_version"])')} +%endif %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} Requires: ruby(abi) = %{ruby_version} ++++++ openwsman-2.4.0.tar.bz2 -> openwsman-2.4.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/ChangeLog new/openwsman-2.4.1/ChangeLog --- old/openwsman-2.4.0/ChangeLog 2013-09-05 10:29:33.000000000 +0200 +++ new/openwsman-2.4.1/ChangeLog 2013-09-11 15:00:06.000000000 +0200 @@ -1,3 +1,11 @@ +2.4.1 +- Build fixes + - Builds now on SLES11 (cmake 2.4), Fedora 18 + - Fedora 19 + - needs rubypick package + - has empty ruby_version in CONFIG + - fix Ruby gem, include version.rb + 2.4.0 - Features - Add support for OptionSet in SOAP header (breaks ABI) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/VERSION.cmake new/openwsman-2.4.1/VERSION.cmake --- old/openwsman-2.4.0/VERSION.cmake 2013-08-05 11:48:01.000000000 +0200 +++ new/openwsman-2.4.1/VERSION.cmake 2013-09-11 11:03:36.000000000 +0200 @@ -44,10 +44,10 @@ # set COMPATMINOR to MINOR. (binary incompatible change) # -# Package version 2.4.0 +# Package version 2.4.1 SET(OPENWSMAN_MAJOR "2") SET(OPENWSMAN_MINOR "4") -SET(OPENWSMAN_PATCH "0") +SET(OPENWSMAN_PATCH "1") # Plugin API 2.2 SET(OPENWSMAN_PLUGIN_API_MAJOR "2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/bindings/java/tests/CMakeLists.txt new/openwsman-2.4.1/bindings/java/tests/CMakeLists.txt --- old/openwsman-2.4.0/bindings/java/tests/CMakeLists.txt 2012-01-03 08:54:48.000000000 +0100 +++ new/openwsman-2.4.1/bindings/java/tests/CMakeLists.txt 2013-09-11 16:33:21.000000000 +0200 @@ -28,7 +28,8 @@ # Identify ADD_TEST(bindings_java_identify_compile ${JAVA_COMPILE} -d ${CMAKE_CURRENT_BINARY_DIR} -cp ${CMAKE_CURRENT_BINARY_DIR}/../${jar_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/identify.java ) -ADD_TEST(bindings_java_identify ${JAVA_RUNTIME} -cp ${CMAKE_CURRENT_BINARY_DIR}/../${jar_NAME}:${CMAKE_CURRENT_BINARY_DIR} identify ) +#ADD_TEST(bindings_java_identify ${JAVA_RUNTIME} -cp ${CMAKE_CURRENT_BINARY_DIR}/../${jar_NAME}:${CMAKE_CURRENT_BINARY_DIR} identify ) +ADD_TEST(bindings_java_identify ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_BINARY_DIR} ${jar_NAME} identify ) # data types # ADD_TEST(bindings_java_fault ${CMAKE_CURRENT_SOURCE_DIR}/run ${CMAKE_CURRENT_SOURCE_DIR} fault ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/bindings/java/tests/run new/openwsman-2.4.1/bindings/java/tests/run --- old/openwsman-2.4.0/bindings/java/tests/run 2012-01-03 08:54:48.000000000 +0100 +++ new/openwsman-2.4.1/bindings/java/tests/run 2013-09-11 16:33:10.000000000 +0200 @@ -2,6 +2,8 @@ # # run script for Java tests # -# Usage: run <dir> <file> +# Usage: run <bindir> <jarname> <file> # -(cd $1; java -Djava.library.path=`pwd` $2) +(cd $1; + f=`dirname $0`; + LD_LIBRARY_PATH=$f/../../../build/src/lib java -Djava.library.path=`pwd` -cp ../$2:$1 $3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/bindings/perl/tests/run new/openwsman-2.4.1/bindings/perl/tests/run --- old/openwsman-2.4.0/bindings/perl/tests/run 2012-01-03 08:54:48.000000000 +0100 +++ new/openwsman-2.4.1/bindings/perl/tests/run 2013-09-11 16:12:27.000000000 +0200 @@ -4,4 +4,6 @@ # # Usage: run <dir> <file> # -(cd $1; perl $2) +(cd $1; + f=`dirname $0`; + LD_LIBRARY_PATH=$f/../../../build/src/lib perl $2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/bindings/python/tests/run new/openwsman-2.4.1/bindings/python/tests/run --- old/openwsman-2.4.0/bindings/python/tests/run 2012-01-03 08:54:48.000000000 +0100 +++ new/openwsman-2.4.1/bindings/python/tests/run 2013-09-11 16:11:44.000000000 +0200 @@ -4,4 +4,6 @@ # # Usage: run <dir> <file> # -(cd $1; python $2) +(cd $1; + f=`dirname $0`; + LD_LIBRARY_PATH=$f/../../../build/src/lib python $2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/bindings/ruby/CMakeLists.txt new/openwsman-2.4.1/bindings/ruby/CMakeLists.txt --- old/openwsman-2.4.0/bindings/ruby/CMakeLists.txt 2013-09-10 13:10:26.000000000 +0200 +++ new/openwsman-2.4.1/bindings/ruby/CMakeLists.txt 2013-09-11 14:53:53.000000000 +0200 @@ -122,6 +122,7 @@ COMMAND "mkdir" "-p" "lib/openwsman" COMMAND "cp" "${CMAKE_CURRENT_SOURCE_DIR}/openwsman.rb" "lib" COMMAND "cp" "${CMAKE_CURRENT_SOURCE_DIR}/openwsman/*.rb" "lib/openwsman" + COMMAND "cp" "${CMAKE_CURRENT_BINARY_DIR}/openwsman/version.rb" "lib/openwsman" DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/extconf.rb DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/openwsman.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/bindings/ruby/openwsman/xmldoc.rb new/openwsman-2.4.1/bindings/ruby/openwsman/xmldoc.rb --- old/openwsman-2.4.0/bindings/ruby/openwsman/xmldoc.rb 2013-09-10 15:25:32.000000000 +0200 +++ new/openwsman-2.4.1/bindings/ruby/openwsman/xmldoc.rb 2013-09-11 14:28:38.000000000 +0200 @@ -3,7 +3,7 @@ # # Assume XmlDoc.foo means XmlDoc.body.foo # - def method_missing method, *args :nodoc: + def method_missing method, *args # :nodoc: self.body.send method,*args end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/bindings/ruby/rdoc1_9.rb new/openwsman-2.4.1/bindings/ruby/rdoc1_9.rb --- old/openwsman-2.4.0/bindings/ruby/rdoc1_9.rb 2013-09-12 14:33:38.000000000 +0200 +++ new/openwsman-2.4.1/bindings/ruby/rdoc1_9.rb 2013-09-12 14:33:38.000000000 +0200 @@ -1 +1 @@ -symbolic link to /usr/bin/rdoc1.9 +symbolic link to /usr/bin/rdoc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/bindings/ruby/rdoc2_0.rb new/openwsman-2.4.1/bindings/ruby/rdoc2_0.rb --- old/openwsman-2.4.0/bindings/ruby/rdoc2_0.rb 2013-09-12 14:33:38.000000000 +0200 +++ new/openwsman-2.4.1/bindings/ruby/rdoc2_0.rb 2013-09-12 14:33:38.000000000 +0200 @@ -1 +1 @@ -symbolic link to /usr/bin/rdoc2.0 +symbolic link to /usr/bin/rdoc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/cmake/modules/FindRuby.cmake new/openwsman-2.4.1/cmake/modules/FindRuby.cmake --- old/openwsman-2.4.0/cmake/modules/FindRuby.cmake 2013-08-05 11:47:23.000000000 +0200 +++ new/openwsman-2.4.1/cmake/modules/FindRuby.cmake 2013-09-11 10:12:01.000000000 +0200 @@ -57,10 +57,15 @@ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDORARCH_DIR ERROR_QUIET) -IF(RUBY_VENDORARCH_DIR AND NOT(${RUBY_VENDORARCH_DIR} STREQUAL "nil")) +IF(RUBY_VENDORARCH_DIR) + IF(${RUBY_VENDORARCH_DIR} STREQUAL "nil") + ELSE(${RUBY_VENDORARCH_DIR} STREQUAL "nil") EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['vendorlibdir']" OUTPUT_VARIABLE RUBY_VENDORLIB_DIR) -ELSE(RUBY_VENDORARCH_DIR AND NOT(${RUBY_VENDORARCH_DIR} STREQUAL "nil")) + ENDIF(${RUBY_VENDORARCH_DIR} STREQUAL "nil") +ENDIF(RUBY_VENDORARCH_DIR) + +IF(NOT RUBY_VENDORLIB_DIR) # fall back to site*dir EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['sitearchdir']" @@ -68,7 +73,8 @@ EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['sitelibdir']" OUTPUT_VARIABLE RUBY_VENDORLIB_DIR) -ENDIF(RUBY_VENDORARCH_DIR AND NOT(${RUBY_VENDORARCH_DIR} STREQUAL "nil")) + +ENDIF(NOT RUBY_VENDORLIB_DIR) # this is not needed if you use "print" inside the ruby statements # remove the new lines from the output by replacing them with empty strings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/package/openwsman.spec.in new/openwsman-2.4.1/package/openwsman.spec.in --- old/openwsman-2.4.0/package/openwsman.spec.in 2013-09-10 16:03:02.000000000 +0200 +++ new/openwsman-2.4.1/package/openwsman.spec.in 2013-09-11 11:32:15.000000000 +0200 @@ -62,6 +62,10 @@ %endif %endif +%if 0%{?fedora} == 19 +BuildRequires: rubypick +%endif + %if 0%{?fedora} > 0 || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 BuildRequires: perl-devel %endif @@ -206,7 +210,13 @@ %package ruby Requires: ruby + +# RbConfig::CONFIG["ruby_version"] is empty in Fedora 19 !? +%if 0%{?fedora} == 19 +%{!?ruby_version: %global ruby_version %(ruby -r rbconfig -e 'print(RbConfig::CONFIG["RUBY_PROGRAM_VERSION"])')} +%else %{!?ruby_version: %global ruby_version %(ruby -r rbconfig -e 'print(RbConfig::CONFIG["ruby_version"])')} +%endif %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} Requires: ruby(abi) = %{ruby_version} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.0/tests/client/CMakeLists.txt new/openwsman-2.4.1/tests/client/CMakeLists.txt --- old/openwsman-2.4.0/tests/client/CMakeLists.txt 2011-09-09 11:14:54.000000000 +0200 +++ new/openwsman-2.4.1/tests/client/CMakeLists.txt 2013-09-11 16:35:52.000000000 +0200 @@ -5,6 +5,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ) SET( TEST_LIBS wsman wsman_client ${LIBXML2_LIBRARIES} ${CURL_LIBRARIES} "pthread") +SET( CTEST_ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/lib" ) SET( test_references_SOURCES test_references.c ) SET( test_transfer_get_SOURCES test_transfer_get.c ) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org