[packages/openwsman] - updated to 2.6.3 - updated python patch - removed obsolete java patch
qboosh
qboosh at pld-linux.org
Sun Oct 23 18:29:42 CEST 2016
commit b97ca65ad7a351537ab87c2b3fde8e80c29e6aaf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Oct 23 18:31:57 2016 +0200
- updated to 2.6.3
- updated python patch
- removed obsolete java patch
openwsman-java.patch | 10 ----------
openwsman-python.patch | 20 ++++++++++----------
openwsman.spec | 14 ++++++--------
3 files changed, 16 insertions(+), 28 deletions(-)
---
diff --git a/openwsman.spec b/openwsman.spec
index ea22e74..6f52af0 100644
--- a/openwsman.spec
+++ b/openwsman.spec
@@ -13,16 +13,15 @@
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.2
-Release: 6
+Version: 2.6.3
+Release: 1
License: BSD
Group: Libraries
Source0: https://github.com/Openwsman/openwsman/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 221163800046cca5ddb38868d3f82d7e
+# Source0-md5: a14cec2a892a30e055edac36071d8972
Patch0: %{name}-link.patch
-Patch1: %{name}-java.patch
-Patch2: rdoc-rubygems.patch
-Patch3: %{name}-python.patch
+Patch1: rdoc-rubygems.patch
+Patch2: %{name}-python.patch
URL: https://github.com/Openwsman
BuildRequires: cmake >= 2.4
BuildRequires: curl-devel >= 7.12.0
@@ -153,7 +152,6 @@ Wiązania języka Ruby do bibliotek openwsman.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
install -d build
@@ -256,7 +254,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
+%attr(755,root,root) %{_bindir}/winrs
%{ruby_vendorlibdir}/openwsmanplugin.rb
%{ruby_vendorlibdir}/openwsman.rb
%{ruby_vendorlibdir}/openwsman
diff --git a/openwsman-java.patch b/openwsman-java.patch
deleted file mode 100644
index 0746943..0000000
--- a/openwsman-java.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- openwsman-2.2.6/bindings/java/CMakeLists.txt.orig 2011-04-20 13:23:03.000000000 +0200
-+++ openwsman-2.2.6/bindings/java/CMakeLists.txt 2011-10-01 08:29:33.064604676 +0200
-@@ -34,6 +34,7 @@
- COMMAND ${CMAKE_COMMAND} -E echo_append "Creating JAR ..."
- COMMAND ${JAVA_ARCHIVE} cvf ${jar_NAME} *.so org/*
- DEPENDS ${SWIG_OUTPUT}
-+ DEPENDS jwsman
- )
-
- ADD_CUSTOM_TARGET ( jwsman_all ALL
diff --git a/openwsman-python.patch b/openwsman-python.patch
index 7901f05..9ae7893 100644
--- a/openwsman-python.patch
+++ b/openwsman-python.patch
@@ -1,13 +1,13 @@
---- openwsman-2.4.12/CMakeLists.txt.orig 2014-10-28 16:04:47.000000000 +0100
-+++ openwsman-2.4.12/CMakeLists.txt 2015-01-08 20:53:14.732880349 +0100
-@@ -174,9 +174,9 @@
+--- openwsman-2.6.3/CMakeLists.txt.orig 2016-10-23 10:43:32.297160695 +0200
++++ openwsman-2.6.3/CMakeLists.txt 2016-10-23 10:59:47.070483126 +0200
+@@ -177,9 +177,9 @@
IF( BUILD_PYTHON )
MESSAGE(STATUS "Building Python bindings" )
-+ FIND_PACKAGE(PythonInterp REQUIRED)
- FIND_PACKAGE(PythonLibs)
++ FIND_PACKAGE(PythonInterp 2.6 REQUIRED)
+ FIND_PACKAGE(PythonLibs 2.6 REQUIRED)
IF (PYTHON_LIBRARY)
-- FIND_PACKAGE(PythonInterp REQUIRED)
+- FIND_PACKAGE(PythonInterp 2.6 REQUIRED)
MESSAGE(STATUS "Found PythonLibs...")
FIND_PACKAGE(PythonLinkLibs)
IF (PYTHON_LINK_LIBS)
@@ -22,14 +22,14 @@
IF (NOT PYTHON_SITE_DIR)
SET (PYTHON_SITE_DIR ${PYTHON_LIB_DIR})
---- openwsman-2.6.2/bindings/python/CMakeLists.txt~ 2015-10-19 15:27:46.000000000 +0200
-+++ openwsman-2.6.2/bindings/python/CMakeLists.txt 2016-01-01 12:55:29.513957706 +0100
+--- openwsman-2.6.3/bindings/python/CMakeLists.txt.orig 2016-10-23 10:43:32.297160695 +0200
++++ openwsman-2.6.3/bindings/python/CMakeLists.txt 2016-10-23 11:01:11.043815269 +0200
@@ -12,7 +12,7 @@
add_subdirectory(tests)
--EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" OUTPUT_VARIABLE PYTHON_LIB_DIR)
-+EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True,prefix='/usr')" OUTPUT_VARIABLE PYTHON_LIB_DIR)
+-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR)
++EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True,prefix='/usr'))" OUTPUT_VARIABLE PYTHON_LIB_DIR)
STRING(REPLACE "\n" "" PYTHON_LIB_DIR "${PYTHON_LIB_DIR}")
MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openwsman.git/commitdiff/b97ca65ad7a351537ab87c2b3fde8e80c29e6aaf
More information about the pld-cvs-commit
mailing list