[packages/openwsman] - updated to 2.6.2 (note: new libwsman_client soname) - updated link,rdoc-rubygems patches
qboosh
qboosh at pld-linux.org
Mon Oct 26 20:06:17 CET 2015
commit 138a0c32da50e0de1623b96075a0636b023ebea6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Oct 26 20:06:13 2015 +0100
- updated to 2.6.2 (note: new libwsman_client soname)
- updated link,rdoc-rubygems patches
openwsman-link.patch | 4 ++--
openwsman.spec | 17 +++++++++--------
rdoc-rubygems.patch | 16 +++++++++-------
3 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/openwsman.spec b/openwsman.spec
index a003257..d37d14b 100644
--- a/openwsman.spec
+++ b/openwsman.spec
@@ -13,12 +13,12 @@
Summary: Implementation of the Web Services Management specification (WS-Management)
Summary(pl.UTF-8): Implementacja specyfikacji Web Services Management (WS-Management)
Name: openwsman
-Version: 2.4.12
-Release: 2
+Version: 2.6.2
+Release: 1
License: BSD
Group: Libraries
Source0: https://github.com/Openwsman/openwsman/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 4893a41c6fd89b33095c315c79638a75
+# Source0-md5: 221163800046cca5ddb38868d3f82d7e
Patch0: %{name}-link.patch
Patch1: %{name}-java.patch
Patch2: rdoc-rubygems.patch
@@ -43,10 +43,10 @@ BuildRequires: rpmbuild(macros) >= 1.606
%{?with_ruby:BuildRequires: ruby-devel >= 1.9}
%{?with_cim:BuildRequires: sblim-sfcc-devel}
BuildRequires: sed >= 4.0
-BuildRequires: swig >= 1.3.30
-%{?with_perl:BuildRequires: swig-perl >= 1.3.30}
-%{?with_python:BuildRequires: swig-python >= 1.3.30}
-%{?with_ruby:BuildRequires: swig-ruby >= 1.3.30}
+BuildRequires: swig >= 2.0.5
+%{?with_perl:BuildRequires: swig-perl >= 2.0.5}
+%{?with_python:BuildRequires: swig-python >= 2.0.5}
+%{?with_ruby:BuildRequires: swig-ruby >= 2.0.5}
Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -217,7 +217,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libwsman.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libwsman.so.1
%attr(755,root,root) %{_libdir}/libwsman_client.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwsman_client.so.2
+%attr(755,root,root) %ghost %{_libdir}/libwsman_client.so.4
%attr(755,root,root) %{_libdir}/libwsman_clientpp.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libwsman_clientpp.so.1
%attr(755,root,root) %{_libdir}/libwsman_curl_client_transport.so.*.*.*
@@ -256,6 +256,7 @@ rm -rf $RPM_BUILD_ROOT
%if %{with ruby}
%files -n ruby-openwsman
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/winrs.rb
%{ruby_vendorlibdir}/openwsmanplugin.rb
%{ruby_vendorlibdir}/openwsman.rb
%{ruby_vendorlibdir}/openwsman
diff --git a/openwsman-link.patch b/openwsman-link.patch
index 975a2d4..c7064c1 100644
--- a/openwsman-link.patch
+++ b/openwsman-link.patch
@@ -8,12 +8,12 @@
if( HAVE_LIBDL )
TARGET_LINK_LIBRARIES(wsman ${DL_LIBRARIES})
endif( HAVE_LIBDL )
-@@ -62,7 +62,7 @@
+@@ -61,7 +62,7 @@
SET( wsman_client_SOURCES wsman-client.c )
ADD_LIBRARY( ${WSMAN_CLIENT_PKG} SHARED ${wsman_client_SOURCES} )
-TARGET_LINK_LIBRARIES( ${WSMAN_CLIENT_PKG} wsman_curl_client_transport )
+TARGET_LINK_LIBRARIES( ${WSMAN_CLIENT_PKG} wsman_curl_client_transport ssl crypto)
- SET_TARGET_PROPERTIES( ${WSMAN_CLIENT_PKG} PROPERTIES VERSION 2.0.0 SOVERSION 2)
+ SET_TARGET_PROPERTIES( ${WSMAN_CLIENT_PKG} PROPERTIES VERSION 4.0.0 SOVERSION 4)
INSTALL(TARGETS ${WSMAN_CLIENT_PKG} DESTINATION ${LIB_INSTALL_DIR})
diff --git a/rdoc-rubygems.patch b/rdoc-rubygems.patch
index 460276d..fbd378d 100644
--- a/rdoc-rubygems.patch
+++ b/rdoc-rubygems.patch
@@ -1,8 +1,10 @@
---- openwsman-2.4.6/bindings/ruby/rdoc2.0~ 2014-05-20 10:54:21.000000000 +0300
-+++ openwsman-2.4.6/bindings/ruby/rdoc2.0 2014-08-11 00:05:27.200706518 +0300
-@@ -1,4 +1,5 @@
- #!/usr/bin/env ruby
-+require 'rubygems'
- require 'rdoc'
+--- openwsman-2.6.2/bindings/ruby/rdoc.orig 2015-10-19 15:27:46.000000000 +0200
++++ openwsman-2.6.2/bindings/ruby/rdoc 2015-10-26 18:55:14.754207569 +0100
+@@ -40,6 +40,7 @@
+ if major == 1 && minor == 8
+ require 'parse_swig.rb' # load the swig parser
+ else
++ require 'rubygems'
+ require 'rdoc'
- require 'rdoc/encoding'
+ require 'rdoc/encoding'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openwsman.git/commitdiff/138a0c32da50e0de1623b96075a0636b023ebea6
More information about the pld-cvs-commit
mailing list