diff --git a/.gitignore b/.gitignore index b470cbf..ecd1e84 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ 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 diff --git a/openwsman.spec b/openwsman.spec index 3d3ea68..c371720 100644 --- a/openwsman.spec +++ b/openwsman.spec @@ -4,9 +4,6 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif -# RubyGems's macros expect gem_name to exist. -%global gem_name %{name} - Name: openwsman BuildRequires: swig BuildRequires: libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel @@ -16,13 +13,14 @@ BuildRequires: perl-devel pkgconfig openssl-devel #BuildRequires: java-1.8.0-openjdk-devel BuildRequires: cmake BuildRequires: systemd-units -Version: 2.4.6 -Release: 5%{?dist} +Version: 2.4.12 +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 +Source: https://github.com/Openwsman/openwsman/archive/%{name}-%{version}.tar.gz +#Source: https://github.com/Openwsman/openwsman/archive/v%{version}.tar.gz # help2man generated manpage for openwsmand binary Source1: openwsmand.8.gz # service file for systemd @@ -115,24 +113,24 @@ API. -%package -n rubygem-%{gem_name} -License: BSD -Group: Development/Libraries -Summary: Ruby client bindings for Openwsman -Obsoletes: %{name}-ruby < %{version}-%{release} - -%description -n rubygem-%{gem_name} -The openwsman gem provides a Ruby API to manage systems using -the WS-Management protocol. - -%package -n rubygem-%{gem_name}-doc -Summary: Documentation for %{name} -Group: Documentation -Requires: rubygem-%{gem_name} = %{version}-%{release} -BuildArch: noarch - -%description -n rubygem-%{gem_name}-doc -Documentation for rubygem-%{gem_name} +#%package -n rubygem-%{gem_name} +#License: BSD +#Group: Development/Libraries +#Summary: Ruby client bindings for Openwsman +#Obsoletes: %{name}-ruby < %{version}-%{release} +# +#%description -n rubygem-%{gem_name} +#The openwsman gem provides a Ruby API to manage systems using +#the WS-Management protocol. +# +#%package -n rubygem-%{gem_name}-doc +#Summary: Documentation for %{name} +#Group: Documentation +#Requires: rubygem-%{gem_name} = %{version}-%{release} +#BuildArch: noarch +# +#%description -n rubygem-%{gem_name}-doc +#Documentation for rubygem-%{gem_name} #%package java @@ -164,16 +162,6 @@ This package provides Perl bindings to access the openwsman client API. %patch1 -p1 -b .libssl %patch2 -p1 -b .pamsetup -# 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. chmod -x src/cpp/WsmanClient.h @@ -195,31 +183,21 @@ cmake \ -DCMAKE_SKIP_RPATH=1 \ -DPACKAGE_ARCHITECTURE=`uname -m` \ -DLIB=%{_lib} \ + -DBUILD_RUBY=no \ + -DBUILD_RUBY_GEM=no \ .. make CFLAGS="-DSSL_LIB='\"$SSL_LIB\"'" -# Make the freshly build openwsman libraries available to build the gem's -# binary extension. -export LIBRARY_PATH=/builddir/build/BUILD/%{name}-%{version}/build/src/lib -export CPATH=/builddir/build/BUILD/%{name}-%{version}/include/ -export LD_LIBRARY_PATH=/builddir/build/BUILD/%{name}-%{version}/build/src/lib/ - -%gem_install -n ./bindings/ruby/%{name}-%{version}.gem %install cd build -# Do not install the ruby extension, we are proviging the rubygem- instead. -echo -n > bindings/ruby/cmake_install.cmake - make DESTDIR=%{buildroot} install cd .. rm -f %{buildroot}/%{_libdir}/*.la rm -f %{buildroot}/%{_libdir}/openwsman/plugins/*.la rm -f %{buildroot}/%{_libdir}/openwsman/authenticators/*.la -[ -d %{buildroot}/%{ruby_vendorlibdir} ] && rm -f %{buildroot}/%{ruby_vendorlibdir}/openwsmanplugin.rb -[ -d %{buildroot}/%{ruby_vendorlibdir} ] && rm -f %{buildroot}/%{ruby_vendorlibdir}/openwsman.rb mkdir -p %{buildroot}%{_sysconfdir}/init.d install -m 644 etc/openwsman.conf %{buildroot}/%{_sysconfdir}/openwsman install -m 644 etc/openwsman_client.conf %{buildroot}/%{_sysconfdir}/openwsman @@ -235,16 +213,6 @@ install -m 644 include/wsman-xml.h %{buildroot}/%{_includedir}/openwsman install -m 644 include/wsman-xml-binding.h %{buildroot}/%{_includedir}/openwsman install -m 644 include/wsman-dispatcher.h %{buildroot}/%{_includedir}/openwsman -mkdir -p %{buildroot}%{gem_dir} -cp -pa ./build%{gem_dir}/* \ - %{buildroot}%{gem_dir}/ - -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 @@ -284,16 +252,16 @@ rm -f /var/log/wsmand.log %{python_sitearch}/*.pyo %doc AUTHORS COPYING ChangeLog README.md -%files -n rubygem-%{gem_name} -%doc AUTHORS COPYING ChangeLog README.md -%dir %{gem_instdir} -%{gem_libdir} -%{gem_extdir_mri} -%exclude %{gem_cache} -%{gem_spec} +#%files -n rubygem-%{gem_name} +#%doc AUTHORS COPYING ChangeLog README.md +#%dir %{gem_instdir} +#%{gem_libdir} +#%{gem_extdir_mri} +#%exclude %{gem_cache} +#%{gem_spec} -%files -n rubygem-%{gem_name}-doc -%doc %{gem_docdir} +#%files -n rubygem-%{gem_name}-doc +#%doc %{gem_docdir} #%files java #%defattr(-,root,root) @@ -334,6 +302,10 @@ rm -f /var/log/wsmand.log %changelog +* Thu Feb 05 2015 Vitezslav Crhonek - 2.4.12-1 +- Update to openwsman-2.4.12 +- Disable ruby + * Sat Jan 17 2015 Mamoru TASAKA - 2.4.6-5 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_2.2 diff --git a/sources b/sources index ceafe39..e01db07 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 4f2d9b1d7da6d87fcd38a9aa23559723 openwsmand.8.gz 02902aafcd58708c0cdab51af9f4086e v2.4.6.tar.gz +4893a41c6fd89b33095c315c79638a75 openwsman-2.4.12.tar.gz