Hello community, here is the log from the commit of package openwsman for openSUSE:Factory checked in at 2015-01-29 09:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-01-15 15:59:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openwsman.new/openwsman.changes 2015-01-29 09:56:45.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 21 09:31:18 UTC 2015 - [email protected] + +- Fix Fedora 21, RHEL 7, and CentOS 7 build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openwsman.spec ++++++ --- /var/tmp/diff_new_pack.pd6quU/_old 2015-01-29 09:56:46.000000000 +0100 +++ /var/tmp/diff_new_pack.pd6quU/_new 2015-01-29 09:56:46.000000000 +0100 @@ -43,7 +43,7 @@ %if 0%{?fedora} == 16 || (0%{?centos_version}>=500 && 0%{?centos_version}<700) || (0%{?rhel_version}>=500 && 0%{?rhel_version}<700) BuildRequires: java-1.6.0-openjdk-devel %else -%if 0%{?fedora} >= 17 +%if 0%{?fedora} >= 17 || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700 BuildRequires: java-1.7.0-openjdk-devel %else BuildRequires: java-devel @@ -56,13 +56,17 @@ %if 0%{?fedora} + 0%{?rhel_version} + 0%{?centos_version} > 0 +%if 0%{?rhel_version} < 700 BuildRequires: ruby-devel +%endif + BuildRequires: ruby-libs %endif -%if (0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600) || 0%{?centos_version} >= 500 || 0%{?fedora} < 17 -# rdoc is separate from rhel5 on +%if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 || 0%{?fedora} > 16 +BuildRequires: rubygem-rdoc +%else BuildRequires: ruby-rdoc %endif @@ -228,7 +232,7 @@ Requires: ruby # RbConfig::CONFIG["ruby_version"] is empty in Fedora > 18 !? -%if 0%{?fedora} > 18 +%if 0%{?fedora} > 18 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 %{!?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"])')} ++++++ openwsman-2.4.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.13/CMakeLists.txt new/openwsman-2.4.13/CMakeLists.txt --- old/openwsman-2.4.13/CMakeLists.txt 2015-01-13 14:06:54.000000000 +0100 +++ new/openwsman-2.4.13/CMakeLists.txt 2015-01-21 09:47:37.000000000 +0100 @@ -14,7 +14,9 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 OLD) cmake_policy(SET CMP0005 OLD) + if ( POLICY CMP0046 ) cmake_policy(SET CMP0046 OLD) + endif ( POLICY CMP0046 ) endif(COMMAND cmake_policy) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.13/bindings/ruby/CMakeLists.txt new/openwsman-2.4.13/bindings/ruby/CMakeLists.txt --- old/openwsman-2.4.13/bindings/ruby/CMakeLists.txt 2015-01-15 08:58:00.000000000 +0100 +++ new/openwsman-2.4.13/bindings/ruby/CMakeLists.txt 2015-01-21 10:25:35.000000000 +0100 @@ -6,7 +6,7 @@ add_subdirectory(tests) -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['ruby_version']" OUTPUT_VARIABLE RUBY_VERSION) +EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print (RbConfig::CONFIG['ruby_version']||RbConfig::CONFIG['RUBY_PROGRAM_VERSION'])" OUTPUT_VARIABLE RUBY_VERSION) # prefer vendor dirs SET(RUBY_WSMAN_LIB_DIR ${RUBY_VENDORLIB_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.13/cmake/modules/FindRuby.cmake new/openwsman-2.4.13/cmake/modules/FindRuby.cmake --- old/openwsman-2.4.13/cmake/modules/FindRuby.cmake 2014-10-20 10:00:56.000000000 +0200 +++ new/openwsman-2.4.13/cmake/modules/FindRuby.cmake 2015-01-21 09:42:48.000000000 +0100 @@ -21,7 +21,7 @@ # RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'` # RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'` -FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby19 ruby1.8 ruby18 ) +FIND_PROGRAM(RUBY_EXECUTABLE NAMES ruby ruby22 ruby21 ruby20 ruby19 ruby1.8 ruby18 ) EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['MAJOR']" OUTPUT_VARIABLE RUBY_VERSION_MAJOR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openwsman-2.4.13/package/openwsman.spec.in new/openwsman-2.4.13/package/openwsman.spec.in --- old/openwsman-2.4.13/package/openwsman.spec.in 2015-01-13 12:13:12.000000000 +0100 +++ new/openwsman-2.4.13/package/openwsman.spec.in 2015-01-21 10:26:01.000000000 +0100 @@ -43,7 +43,7 @@ %if 0%{?fedora} == 16 || (0%{?centos_version}>=500 && 0%{?centos_version}<700) || (0%{?rhel_version}>=500 && 0%{?rhel_version}<700) BuildRequires: java-1.6.0-openjdk-devel %else -%if 0%{?fedora} >= 17 +%if 0%{?fedora} >= 17 || 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700 BuildRequires: java-1.7.0-openjdk-devel %else BuildRequires: java-devel @@ -56,13 +56,17 @@ %if 0%{?fedora} + 0%{?rhel_version} + 0%{?centos_version} > 0 +%if 0%{?rhel_version} < 700 BuildRequires: ruby-devel +%endif + BuildRequires: ruby-libs %endif -%if (0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600) || 0%{?centos_version} >= 500 || 0%{?fedora} < 17 -# rdoc is separate from rhel5 on +%if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 || 0%{?fedora} > 16 +BuildRequires: rubygem-rdoc +%else BuildRequires: ruby-rdoc %endif @@ -228,7 +232,7 @@ Requires: ruby # RbConfig::CONFIG["ruby_version"] is empty in Fedora > 18 !? -%if 0%{?fedora} > 18 +%if 0%{?fedora} > 18 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 %{!?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"])')} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
