Update to openwsman-2.4.15

.gitignore

@@ -10,3 +10,5 @@ openwsman-2.2.3.tar.bz2
 /v2.4.3.tar.gz
 /v2.4.4.tar.gz
 /v2.4.6.tar.gz
+/openwsman-2.4.12.tar.gz
+/openwsman-2.4.15.tar.gz

openwsman-2.4.12-ruby-binding-build.patch

@@ -0,0 +1,12 @@
+diff -up openwsman-2.4.12/bindings/ruby/extconf.rb.orig openwsman-2.4.12/bindings/ruby/extconf.rb
+--- openwsman-2.4.12/bindings/ruby/extconf.rb.orig	2015-02-09 09:28:58.232581263 +0100
++++ openwsman-2.4.12/bindings/ruby/extconf.rb	2015-02-09 09:38:22.836772879 +0100
+@@ -32,7 +32,7 @@ swig = find_executable("swig")
+ raise "SWIG not found" unless swig
+ 
+ major, minor, path = RUBY_VERSION.split(".")
+-raise "SWIG failed to run" unless system("#{swig} -ruby -autorename -DRUBY_VERSION=#{major}#{minor} -I. -I/usr/include/openwsman -o openwsman_wrap.c openwsman.i")
++raise "SWIG failed to run" unless system("#{swig} -ruby -autorename -DRUBY_VERSION=#{major}#{minor} -I. -I/usr/include/openwsman -I/builddir/build/BUILD/openwsman-2.4.15/include/ -o openwsman_wrap.c openwsman.i")
+ 
+ $CPPFLAGS = "-I/usr/include/openwsman -I.."
+ 

openwsman-2.4.15-fix-version.patch

@@ -0,0 +1,16 @@
+diff -up openwsman-2.4.15/VERSION.cmake.orig openwsman-2.4.15/VERSION.cmake
+--- openwsman-2.4.15/VERSION.cmake.orig	2015-05-20 12:02:32.000000000 +0200
++++ openwsman-2.4.15/VERSION.cmake	2015-06-23 11:08:34.230013254 +0200
+@@ -44,10 +44,10 @@
+ #    set COMPATMINOR to MINOR. (binary incompatible change)
+ #
+ 
+-# Package version 2.4.14
++# Package version 2.4.15
+ SET(OPENWSMAN_MAJOR "2")
+ SET(OPENWSMAN_MINOR "4")
+-SET(OPENWSMAN_PATCH "14")
++SET(OPENWSMAN_PATCH "15")
+ 
+ # Plugin API 2.2
+ SET(OPENWSMAN_PLUGIN_API_MAJOR "2")

openwsman.spec

@@ -13,16 +13,17 @@ BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
 BuildRequires:  python python-devel ruby ruby-devel rubygems-devel perl
 BuildRequires:  python python-devel perl
 BuildRequires:  perl-devel pkgconfig openssl-devel
-#BuildRequires: java-1.8.0-openjdk-devel
 BuildRequires:  cmake
 BuildRequires:  systemd-units
-Version:        2.4.6
-Release:        3%{?dist}
+Version:        2.4.15
+Release:        1%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
 Summary:        Open source Implementation of WS-Management
-Source:         https://github.com/Openwsman/openwsman/archive/v%{version}.tar.gz
+# You can get this tarball here:
+# https://github.com/Openwsman/openwsman/archive/v2.4.12.tar.gz
+Source:         %{name}-%{version}.tar.gz
 # help2man generated manpage for openwsmand binary
 Source1:        openwsmand.8.gz
 # service file for systemd
@@ -31,6 +32,8 @@ Source2:        openwsmand.service
 Source3:        owsmantestcert.sh
 Patch1:         openwsman-2.2.7-libssl.patch
 Patch2:         openwsman-2.4.0-pamsetup.patch
+Patch3:         openwsman-2.4.12-ruby-binding-build.patch
+Patch4:         openwsman-2.4.15-fix-version.patch
 
 %description
 Openwsman is a project intended to provide an open-source
@@ -135,15 +138,6 @@ BuildArch: noarch
 Documentation for rubygem-%{gem_name}
 
 
-#%package java
-#Requires:      java
-#Requires:      libwsman1 = %{version}
-#Summary:       Java bindings for openwsman client API
-#Group:          Development/Libraries
-
-#%description java
-#This package provides Java bindings to access the openwsman client API.
-
 
 
 %package perl
@@ -163,10 +157,15 @@ This package provides Perl bindings to access the openwsman client API.
 %setup -q
 %patch1 -p1 -b .libssl
 %patch2 -p1 -b .pamsetup
+%patch3 -p1 -b .ruby-binding-build
+%patch4 -p1 -b .fix-version
 
-# Fix wrong symlinks (fixed upstream, will be in 2.4.1)
-ln -sf %{_bindir}/rdoc bindings/ruby/rdoc1_9.rb 
-ln -sf %{_bindir}/rdoc bindings/ruby/rdoc2_0.rb 
+# support ruby 2.2
+pushd bindings/ruby
+cat rdoc2.1 | sed -e 's|rdoc2_1|rdoc2_2|' > rdoc2.2
+chmod 0755 rdoc2.2
+ln -sf %{_bindir}/rdoc rdoc2_2.rb
+popd
 
 %build
 # Removing executable permissions on .c and .h files to fix rpmlint warnings. 
@@ -238,7 +237,6 @@ rm -rf %{buildroot}%{gem_instdir}/ext
 mkdir -p %{buildroot}%{gem_extdir_mri}
 cp -a ./build%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
 
-
 %post -n libwsman1 -p /sbin/ldconfig
 
 %postun -n libwsman1 -p /sbin/ldconfig
@@ -289,11 +287,6 @@ rm -f /var/log/wsmand.log
 %files -n rubygem-%{gem_name}-doc
 %doc %{gem_docdir}
 
-#%files java
-#%defattr(-,root,root)
-#%{_javadir}/*jar
-
-
 %files perl
 %{perl_vendorarch}/openwsman.so
 %{perl_vendorlib}/openwsman.pm
@@ -328,6 +321,18 @@ rm -f /var/log/wsmand.log
 
 
 %changelog
+* Tue Jun 23 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.15-1
+- Update to openwsman-2.4.15
+
+* Mon Feb 09 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.12-1
+- Update to openwsman-2.4.12
+
+* Sat Jan 17 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.4.6-5
+- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2
+
+* Tue Aug 26 2014 Jitka Plesnikova <jplesnik@redhat.com> - 2.4.6-4
+- Perl 5.20 rebuild
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
 4f2d9b1d7da6d87fcd38a9aa23559723  openwsmand.8.gz
-02902aafcd58708c0cdab51af9f4086e  v2.4.6.tar.gz
+760fc0520683152004606d9f274c9a72  openwsman-2.4.15.tar.gz