Hello community, here is the log from the commit of package openwsman for openSUSE:Factory checked in at 2012-09-14 12:44:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openwsman (Old) and /work/SRC/openSUSE:Factory/.openwsman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openwsman", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/openwsman/openwsman.changes 2012-06-26 17:09:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openwsman.new/openwsman.changes 2012-09-14 12:44:51.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Aug 11 21:51:08 UTC 2012 - [email protected] + +- fix building for non-SUSE distros, re-add java target for SLES10 +- disable ruby on RHEL6 (missing ruby-devel) + +------------------------------------------------------------------- +Wed Aug 8 11:36:38 UTC 2012 - [email protected] + +- improve FindRuby, fixes CentOS5 and RHEL5 builds + +------------------------------------------------------------------- Old: ---- openwsman-no-explicit-target.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openwsman.spec ++++++ --- /var/tmp/diff_new_pack.UmGbGt/_old 2012-09-14 12:45:09.000000000 +0200 +++ /var/tmp/diff_new_pack.UmGbGt/_new 2012-09-14 12:45:09.000000000 +0200 @@ -30,7 +30,6 @@ BuildRequires: sblim-sfcc-devel BuildRequires: swig >= 1.3.30 -BuildRequires: java-devel BuildRequires: perl BuildRequires: python-devel @@ -40,17 +39,35 @@ %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} BuildRequires: curl-devel + +%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 +BuildRequires: java-1.7.0-openjdk-devel +%else +BuildRequires: java-devel +%endif +%endif + BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: ruby + +%if 0%{?rhel_version} != 600 BuildRequires: ruby-devel +%if 0%{?fedora} != 17 BuildRequires: ruby-rdoc +%endif +%endif + %if 0%{?fedora} > 0 || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600 BuildRequires: perl-devel %endif %endif %if 0%{?suse_version} > 0 +BuildRequires: java-devel # No jni_md.h on SLE10 :-/ #%if 0%{?suse_version} < 1100 #BuildRequires: java-1_5_0-ibm-devel @@ -111,7 +128,6 @@ Source3: %{name}.SuSEfirewall2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source4: %{name}.service -Patch2: openwsman-no-explicit-target.patch %description Opensource Implementation of WS-Management protocol stack @@ -199,9 +215,14 @@ Requires: ruby(abi) = %{ruby_version} %endif +%if 0%{?suse_version} == 1010 +%{!?ruby_sitelib: %global ruby_sitelib %(ruby -r rbconfig -e 'vd = RbConfig::CONFIG["vendorlibdir"]; print(vd ? vd : RbConfig::CONFIG["sitelibdir"])')} +%{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'vad = RbConfig::CONFIG["vendorarchdir"]; print(vad ? vad : RbConfig::CONFIG["sitearchdir"])')} +%else +# SLES 10 can't parse this :-/ %if 0%{?ruby_sitelib} == 0 -%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} -# Fedora, RHEL and CentOS don't have vendor lib +%if ((0%{?fedora}>0) && (0%{?fedora} < 16)) || ((0%{?centos_version}>0) && (0%{?centos_version} < 600)) || ((0%{?rhel_version}>0) && (0%{?rhel_version} < 500)) +# Fedora15, RHEL-5 and CentOS-5 don't have vendor lib # CMAKE checks for "ruby -r vendor-specific" and fails %{!?ruby_sitelib: %global ruby_sitelib %(ruby -r rbconfig -e 'print(RbConfig::CONFIG["sitelibdir"])')} %{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'print(RbConfig::CONFIG["sitearchdir"])')} @@ -210,6 +231,8 @@ %{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'vad = RbConfig::CONFIG["vendorarchdir"]; print(vad ? vad : RbConfig::CONFIG["sitearchdir"])')} %endif %endif +%endif + Summary: Ruby bindings for openwsman client API Group: System/Management @@ -251,7 +274,6 @@ %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora} || 0%{?rhel} %patch1 -p1 %endif -%patch2 -p1 %build rm -rf build @@ -261,6 +283,11 @@ # CURLOPT_SSL_CTX_FUNCTION is defined, but does not work on e.g. Fedora export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DNO_SSL_CALLBACK" %endif +# SLES 10 needs explicit java bytecode target +%if 0%{?suse_version} == 1010 || 0%{?suse_version} == 1110 +export EXPLICIT_TARGET=1.5 +%endif + export SSL_LIB=`readlink %{_libdir}/libssl.so` cd build cmake \ @@ -271,6 +298,7 @@ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ -DCMAKE_SKIP_RPATH=1 \ -DPACKAGE_ARCHITECTURE=`uname -m` \ + -DEXPLICIT_TARGET="$EXPLICIT_TARGET" \ -DLIB=%{_lib} \ -DBUILD_RUBY_GEM=no \ .. @@ -375,7 +403,9 @@ %files python %defattr(-,root,root) %{python_sitearch}/*.so -%{python_sitearch}/*.py +%{python_sitearch}/*.py* + +%if 0%{?rhel_version} != 600 %files ruby %defattr(-,root,root) @@ -391,6 +421,8 @@ %{ruby_sitelib}/openwsman/*.rb %endif +%endif + %files perl %defattr(-,root,root) %{perl_vendorarch}/openwsman.so ++++++ openwsman-2.3.5.tar.bz2 ++++++ ++++ 24711 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
