[packages/openwsman/dev-2.4] up to 2.4.6, project moved to github
glen
glen at pld-linux.org
Sun Aug 10 23:30:58 CEST 2014
commit 6961ea6ab293fc80fcb77e85e0848ca0dde251d7
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon Aug 11 00:30:16 2014 +0300
up to 2.4.6, project moved to github
openwsman-java.patch | 11 -----------
openwsman-link.patch | 38 ++++++++------------------------------
openwsman.spec | 39 ++++++++++++++++++++-------------------
rdoc-rubygems.patch | 8 ++++++++
4 files changed, 36 insertions(+), 60 deletions(-)
---
diff --git a/openwsman.spec b/openwsman.spec
index 61dd840..3ffa2f9 100644
--- a/openwsman.spec
+++ b/openwsman.spec
@@ -1,6 +1,7 @@
# TODO:
# - daemon init script
# - where should arch-dependent .jar be packaged?
+# - add -module to plugins build?
# - more bconds:
#OPTION( BUILD_LIBCIM "Build CIM plugin" YES )
#OPTION( BUILD_EXAMPLES "Build examples" YES )
@@ -22,16 +23,16 @@
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.2.6
-Release: 4
+Version: 2.4.6
+Release: 1
License: BSD
Group: Libraries
-Source0: http://downloads.sourceforge.net/openwsman/%{name}-%{version}.tar.bz2
-# Source0-md5: 55b59e467630e00b958a0231942b686f
+Source0: https://github.com/Openwsman/openwsman/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 02902aafcd58708c0cdab51af9f4086e
Patch0: %{name}-link.patch
-Patch1: %{name}-ruby.patch
-Patch2: %{name}-java.patch
-URL: http://www.openwsman.org/project/openwsman
+Patch1: %{name}-java.patch
+Patch2: rdoc-rubygems.patch
+URL: https://github.com/Openwsman
BuildRequires: cmake >= 2.4
BuildRequires: curl-devel >= 7.12.0
BuildRequires: jdk
@@ -54,7 +55,7 @@ Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# plugins use symbols from libraries, client libs have circular dependencies with libwsman
-%define skip_post_check_so .*%{_libdir}/openwsman/.* libwsman_client.so.* libwsman_curl_client_transport.so.*
+%define skip_post_check_so .*%{_libdir}/openwsman/.* libwsman_client.so.* libwsman_curl_client_transport.so.* libwsman_server.so.1.0.0 libwsman_clientpp.so.1.0.0
%description
Openwsman is a project intended to provide an open-source
@@ -129,7 +130,7 @@ Summary: Python bindings for openwsman libraries
Summary(pl.UTF-8): Wiązania Pythona do bibliotek openwsman
Group: Libraries/Python
Requires: %{name}-libs = %{version}-%{release}
-%pyrequires_eq python-libs
+Requires: python-libs
%description -n python-openwsman
Python bindings for openwsman libraries.
@@ -157,10 +158,6 @@ Wiązania języka Ruby do bibliotek openwsman.
%patch1 -p1
%patch2 -p1
-%{__sed} -i -e 's,rubyio\.h,ruby/io.h,' \
- bindings/openwsman.i \
- src/plugins/swig/plugin.i
-
%build
install -d build
cd build
@@ -174,6 +171,8 @@ cd build
-DRUBY_HAS_VENDOR_RUBY:BOOL=ON \
-DPACKAGE_ARCHITECTURE=%{_target_cpu} \
+%{__make}
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/var/lib/openwsman/subscriptions
@@ -193,26 +192,27 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
+%doc AUTHORS ChangeLog README.md TODO
%attr(755,root,root) %{_sbindir}/openwsmand
%dir %{_libdir}/openwsman
%dir %{_libdir}/openwsman/authenticators
%attr(755,root,root) %{_libdir}/openwsman/authenticators/libwsman_*.so*
%dir %{_libdir}/openwsman/plugins
%attr(755,root,root) %{_libdir}/openwsman/plugins/libwsman_*.so*
+%attr(755,root,root) %{_libdir}/openwsman/plugins/libredirect.so*
%dir %{_sysconfdir}/openwsman
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openwsman/openwsman.conf
%attr(754,root,root) %{_sysconfdir}/openwsman/owsmangencert.sh
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/openwsman/ssleay.cnf
%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/openwsman
-/var/lib/openwsman
+%dir /var/lib/openwsman
%files libs
%defattr(644,root,root,755)
%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.1
+%attr(755,root,root) %ghost %{_libdir}/libwsman_client.so.2
%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.*.*.*
@@ -240,18 +240,19 @@ rm -rf $RPM_BUILD_ROOT
%files -n perl-openwsman
%defattr(644,root,root,755)
-%attr(755,root,root) %{perl_vendorarch}/openwsman.so
%{perl_vendorlib}/openwsman.pm
+%attr(755,root,root) %{perl_vendorarch}/openwsman.so
%files -n python-openwsman
%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/_pywsman.so
%{py_sitedir}/pywsman.py[co]
+%attr(755,root,root) %{py_sitedir}/_pywsman.so
%if %{with ruby}
%files -n ruby-openwsman
%defattr(644,root,root,755)
-%attr(755,root,root) %{ruby_vendorarchdir}/openwsman.so
%{ruby_vendorlibdir}/openwsmanplugin.rb
+%{ruby_vendorlibdir}/openwsman.rb
%{ruby_vendorlibdir}/openwsman
+%attr(755,root,root) %{ruby_vendorarchdir}/_openwsman.so
%endif
diff --git a/openwsman-java.patch b/openwsman-java.patch
index d424d4e..0746943 100644
--- a/openwsman-java.patch
+++ b/openwsman-java.patch
@@ -8,14 +8,3 @@
)
ADD_CUSTOM_TARGET ( jwsman_all ALL
---- openwsman-2.2.6/bindings/java/CMakeLists.txt~ 2013-06-13 09:10:15.910113378 +0200
-+++ openwsman-2.2.6/bindings/java/CMakeLists.txt 2013-06-13 09:32:56.695027687 +0200
-@@ -30,7 +30,7 @@
- OUTPUT ${jar_NAME}
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E echo_append "Compiling Java files ..."
-- COMMAND ${JAVA_COMPILE} -target 1.5 -d . *.java
-+ COMMAND ${JAVA_COMPILE} -d . *.java
- COMMAND ${CMAKE_COMMAND} -E echo_append "Creating JAR ..."
- COMMAND ${JAVA_ARCHIVE} cvf ${jar_NAME} *.so org/*
- DEPENDS ${SWIG_OUTPUT}
diff --git a/openwsman-link.patch b/openwsman-link.patch
index 919e53c..975a2d4 100644
--- a/openwsman-link.patch
+++ b/openwsman-link.patch
@@ -1,5 +1,5 @@
---- openwsman-2.2.6/src/lib/CMakeLists.txt.orig 2011-04-20 13:23:04.000000000 +0200
-+++ openwsman-2.2.6/src/lib/CMakeLists.txt 2011-09-29 18:09:11.159983195 +0200
+--- 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} )
@@ -8,34 +8,12 @@
if( HAVE_LIBDL )
TARGET_LINK_LIBRARIES(wsman ${DL_LIBRARIES})
endif( HAVE_LIBDL )
-@@ -50,7 +51,7 @@
-
- SET( wsman_curl_client_transport_SOURCES wsman-client-transport.c wsman-curl-client-transport.c )
- ADD_LIBRARY( wsman_curl_client_transport SHARED ${wsman_curl_client_transport_SOURCES} )
--TARGET_LINK_LIBRARIES( wsman_curl_client_transport ${CURL_LIBRARIES} )
-+TARGET_LINK_LIBRARIES( wsman_curl_client_transport ${CURL_LIBRARIES} ssl crypto )
- SET_TARGET_PROPERTIES(wsman_curl_client_transport PROPERTIES VERSION 1.0.0 SOVERSION 1)
- INSTALL(TARGETS wsman_curl_client_transport DESTINATION ${LIB_INSTALL_DIR})
-
-@@ -60,7 +61,7 @@
+@@ -62,7 +62,7 @@
SET( wsman_client_SOURCES wsman-client.c )
- ADD_LIBRARY( wsman_client SHARED ${wsman_client_SOURCES} )
--TARGET_LINK_LIBRARIES( wsman_client wsman_curl_client_transport )
-+TARGET_LINK_LIBRARIES( wsman_client wsman_curl_client_transport )
- SET_TARGET_PROPERTIES(wsman_client PROPERTIES VERSION 1.0.0 SOVERSION 1)
- INSTALL(TARGETS wsman_client DESTINATION ${LIB_INSTALL_DIR})
-
---- openwsman-2.2.6/src/cpp/CMakeLists.txt.orig 2011-04-20 13:23:04.000000000 +0200
-+++ openwsman-2.2.6/src/cpp/CMakeLists.txt 2011-09-29 18:16:41.103331596 +0200
-@@ -7,8 +7,8 @@
- SET( wsmaninclude_HEADERS OpenWsmanClient.h Exception.h WsmanClient.h WsmanFilter.h WsmanEPR.h )
- SET(wsman_clientpp_LIB_SRCS OpenWsmanClient.cpp )
- add_library(wsman_clientpp SHARED ${wsman_clientpp_LIB_SRCS})
--
--set_target_properties(wsman_clientpp PROPERTIES VERSION 1.0.0 SOVERSION 1)
-+TARGET_LINK_LIBRARIES(wsman_clientpp wsman_client wsman)
-+set_target_properties(wsman_clientpp PROPERTIES VERSION 1.0.0 SOVERSION 1 LINK_FLAGS "-L../lib")
- install(TARGETS wsman_clientpp DESTINATION ${LIB_INSTALL_DIR})
-
+ 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)
+ INSTALL(TARGETS ${WSMAN_CLIENT_PKG} DESTINATION ${LIB_INSTALL_DIR})
diff --git a/rdoc-rubygems.patch b/rdoc-rubygems.patch
new file mode 100644
index 0000000..460276d
--- /dev/null
+++ b/rdoc-rubygems.patch
@@ -0,0 +1,8 @@
+--- 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'
+
+ require 'rdoc/encoding'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openwsman.git/commitdiff/6961ea6ab293fc80fcb77e85e0848ca0dde251d7
More information about the pld-cvs-commit
mailing list