- updated to 2.6.9

diff --git a/openwsman-link.patch b/openwsman-link.patch
deleted file mode 100644 (file)
index c7064c1..0000000
--- a/openwsman-link.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- openwsman-2.4.6/src/lib/CMakeLists.txt~    2014-08-10 23:52:43.000000000 +0300
-+++ openwsman-2.4.6/src/lib/CMakeLists.txt     2014-08-10 23:53:54.783791323 +0300
-@@ -25,6 +25,7 @@
- ADD_LIBRARY( wsman SHARED ${wsman_SOURCES} )
- TARGET_LINK_LIBRARIES( wsman ${LIBXML2_LIBRARIES} )
- TARGET_LINK_LIBRARIES( wsman ${CMAKE_THREAD_LIBS_INIT} )
-+TARGET_LINK_LIBRARIES( wsman m )
- if( HAVE_LIBDL )
- TARGET_LINK_LIBRARIES(wsman ${DL_LIBRARIES})
- endif( HAVE_LIBDL )
-@@ -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 4.0.0 SOVERSION 4)
- INSTALL(TARGETS ${WSMAN_CLIENT_PKG} DESTINATION ${LIB_INSTALL_DIR})
- 

diff --git a/openwsman-python.patch b/openwsman-python.patch
index 60f7dee0f58926cf2f35f5895dae5e7f83baddf0..4b55ded3a71719ae8ef8109f3995b6ef160c8631 100644 (file)
--- a/openwsman-python.patch
+++ b/openwsman-python.patch
@@ -11,10 +11,10 @@
    SET (PYTHON_SITE_DIR ${PYTHON_LIB_DIR})
 --- openwsman-2.6.5/bindings/python/CMakeLists.txt.orig        2017-11-28 09:32:15.000000000 +0100
 +++ openwsman-2.6.5/bindings/python/CMakeLists.txt     2018-09-03 21:47:58.258854144 +0200
-@@ -13,9 +13,9 @@
- add_subdirectory(tests)
- 
- set(Python_ADDITIONAL_VERSIONS 3.6 3.5 2.7 2.6)
+@@ -17,9 +17,9 @@
+ ELSE( BUILD_PYTHON3 )
+ set(Python_ADDITIONAL_VERSIONS 2.7 2.6)
+ ENDIF( BUILD_PYTHON3 )
 +FIND_PACKAGE(PythonInterp REQUIRED)
  FIND_PACKAGE(PythonLibs)
  IF (PYTHON_LIBRARY)
@@ -22,7 +22,7 @@
    #MESSAGE(STATUS "Found PythonLibs...")
    FIND_PACKAGE(PythonLinkLibs)
    #IF (PYTHON_LINK_LIBS)
-@@ -25,7 +25,7 @@
+@@ -29,7 +29,7 @@
    MESSAGE(STATUS "No Python found")
  ENDIF (PYTHON_LIBRARY)
  

diff --git a/openwsman.spec b/openwsman.spec
index a715993f6cd7e0fb2a9f77edc959a0e7dc31857b..08a10f3a506f67ce3fcf694d4faac073d4b48fd0 100644 (file)
--- a/openwsman.spec
+++ b/openwsman.spec
@@ -13,16 +13,14 @@
 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.6.5
-Release:       3
+Version:       2.6.9
+Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       https://github.com/Openwsman/openwsman/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 84d066233a0b9d6ef00657dc8241d353
-Patch0:                %{name}-link.patch
-Patch1:                rdoc-rubygems.patch
-Patch2:                %{name}-python.patch
-Patch3:                openssl.patch
+# Source0-md5: 82f0cdab1ccbad847e994ed6f4c19b01
+Patch0:                rdoc-rubygems.patch
+Patch1:                %{name}-python.patch
 URL:           https://github.com/Openwsman
 BuildRequires: cmake >= 2.4
 BuildRequires: curl-devel >= 7.12.0
@@ -152,8 +150,6 @@ Wiązania języka Ruby do bibliotek openwsman.
 %undos src/cpp/CMakeLists.txt
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 install -d build
@@ -167,6 +163,7 @@ cd build
        %{!?with_cim:-DBUILD_LIBCIM=NO} \
        %{!?with_perl:-DBUILD_PERL=NO} \
        %{!?with_python:-DBUILD_PYTHON=NO} \
+       -DBUILD_PYTHON3=NO \
        -DBUILD_RUBY=%{!?with_ruby:NO}%{?with_ruby:YES} \
        -DPACKAGE_ARCHITECTURE=%{_target_cpu} \
        -DPYTHON_EXECUTABLE=%{__python} \