Compare commits

..

11 Commits

Author SHA1 Message Date
Vitezslav Crhonek 06fb6406fe Update to openwsman-2.3.6 2012-11-08 16:00:52 +01:00
Vitezslav Crhonek 3e9a4e1762 Update to openwsman-2.3.5, Enable ruby subpackage again 2012-09-17 15:04:25 +02:00
Vitezslav Crhonek a9a4f48259 Fix issues found by fedora-review utility in the spec file 2012-08-28 15:15:13 +02:00
Vitezslav Crhonek e4a1245a35 Use new systemd-rpm macros 2012-08-23 11:54:13 +02:00
Dennis Gilmore 11acc803c6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-20 02:22:31 -05:00
Petr Písař e6afca396c Perl 5.16 rebuild 2012-06-10 22:35:36 +02:00
Vitezslav Crhonek 16bed8b00c Rename service file 2012-05-28 14:01:53 +02:00
Vitezslav Crhonek 797f465467 Add systemd support 2012-05-23 14:47:20 +02:00
Vitezslav Crhonek b833a80033 Update to openwsman-2.3.0 2012-03-27 12:41:28 +02:00
Vitezslav Crhonek 047514163b Fix libssl loading 2012-02-09 14:27:25 +01:00
Vitezslav Crhonek 4e5ae91a5a Temporarily disable ruby subpackage 2012-02-09 09:26:56 +01:00
5 changed files with 83 additions and 65 deletions
+3
View File
@@ -2,3 +2,6 @@ openwsman-2.2.3.tar.bz2
/openwsman-2.2.4.tar.bz2
/openwsman-2.2.5.tar.bz2
/openwsman-2.2.7.tar.bz2
/openwsman-2.3.0.tar.bz2
/openwsman-2.3.5.tar.bz2
/openwsman-2.3.6.tar.bz2
+7 -7
View File
@@ -1,12 +1,12 @@
diff -up openwsman-2.2.7/CMakeLists.txt.ruby openwsman-2.2.7/CMakeLists.txt
--- openwsman-2.2.7/CMakeLists.txt.ruby 2012-02-09 09:13:51.222066933 +0100
+++ openwsman-2.2.7/CMakeLists.txt 2012-02-09 09:14:01.059119669 +0100
@@ -103,7 +103,7 @@ SET( BUILD_JAVA_EXPLICIT ${BUILD_JAVA})
diff -up openwsman-2.3.0/CMakeLists.txt.orig openwsman-2.3.0/CMakeLists.txt
--- openwsman-2.3.0/CMakeLists.txt.orig 2012-03-27 11:51:51.262460385 +0200
+++ openwsman-2.3.0/CMakeLists.txt 2012-03-27 11:52:13.732573549 +0200
@@ -105,7 +105,7 @@ SET( BUILD_JAVA_EXPLICIT ${BUILD_JAVA})
OPTION( BUILD_LIBCIM "Build CIM plugin" YES )
OPTION( BUILD_EXAMPLES "Build examples" YES )
OPTION( BUILD_PYTHON "Build Python bindings" YES )
-OPTION( BUILD_RUBY "Build Ruby bindings" YES )
+OPTION( BUILD_RUBY "Build Ruby bindings" NO )
OPTION( BUILD_PERL "Build Perl bindings" YES )
OPTION( BUILD_JAVA "Build Java bindings" YES )
OPTION( BUILD_CSHARP "Build C# bindings" YES)
IF( BUILD_RUBY )
OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES )
ENDIF( BUILD_RUBY )
+12
View File
@@ -0,0 +1,12 @@
diff -up openwsman-2.2.7/src/server/shttpd/compat_unix.h.orig openwsman-2.2.7/src/server/shttpd/compat_unix.h
--- openwsman-2.2.7/src/server/shttpd/compat_unix.h.orig 2012-02-09 13:04:47.528527681 +0100
+++ openwsman-2.2.7/src/server/shttpd/compat_unix.h 2012-02-09 13:05:31.582568867 +0100
@@ -21,7 +21,7 @@
#include <dirent.h>
#include <dlfcn.h>
#ifndef SSL_LIB
-#define SSL_LIB "libssl.so"
+#define SSL_LIB "libssl.so.10"
#endif
#define DIRSEP '/'
#define IS_DIRSEP_CHAR(c) ((c) == '/')
+60 -56
View File
@@ -3,19 +3,19 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%endif
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -r rbconfig -e 'vd = RbConfig::CONFIG["vendorlibdir"]; print(vd ? vd : RbConfig::CONFIG["sitelibdir"])')}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'vad = RbConfig::CONFIG["vendorarchdir"]; print(vad ? vad : RbConfig::CONFIG["sitearchdir"])')}
Name: openwsman
BuildRequires: swig
BuildRequires: libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
#BuildRequires: python python-devel ruby ruby-devel ruby-rdoc perl
BuildRequires: python python-devel ruby ruby-devel rubygem(rdoc) perl
BuildRequires: python python-devel perl
BuildRequires: perl-devel pkgconfig openssl-devel
BuildRequires: cmake
BuildRequires: systemd-units
Version: 2.2.7
Release: 5%{?dist}
Version: 2.3.6
Release: 1%{?dist}
Url: http://www.openwsman.org/
License: BSD
Group: Applications/System
@@ -28,8 +28,7 @@ Source2: openwsmand.service
# script for testing presence of the certificates in ExecStartPre
Source3: owsmantestcert.sh
Patch0: %{name}-sitelibdir.patch
Patch2: openwsman-2.2.7-disable-ruby.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
Patch1: openwsman-2.2.7-libssl.patch
%description
Openwsman is a project intended to provide an open-source
@@ -112,15 +111,15 @@ API.
#%package ruby
#License: BSD
#Group: Development/Libraries
#Requires: ruby
#Requires: ruby(abi) = 1.9.1
#Summary: Ruby bindings for openwsman client API
#
#%description ruby
#This package provides Ruby bindings to access the openwsman client API.
%package ruby
License: BSD
Group: Development/Libraries
Requires: ruby
Requires: ruby(abi) = 1.9.1
Summary: Ruby bindings for openwsman client API
%description ruby
This package provides Ruby bindings to access the openwsman client API.
@@ -141,7 +140,7 @@ This package provides Perl bindings to access the openwsman client API.
%setup -q
# don't make backup of file patched by patch0, it'll be installed...
%patch0 -p1
%patch2 -p1
%patch1 -p1 -b .libssl
%build
# Removing executable permissions on .c and .h files to fix rpmlint warnings.
@@ -162,12 +161,12 @@ cmake \
-DCMAKE_SKIP_RPATH=1 \
-DPACKAGE_ARCHITECTURE=`uname -m` \
-DLIB=%{_lib} \
-DBUILD_RUBY_GEM=no \
..
make CFLAGS="-DSSL_LIB='\"$SSL_LIB\"'"
%install
rm -rf %{buildroot}
cd build
make DESTDIR=%{buildroot} install
cd ..
@@ -180,7 +179,7 @@ rm -f %{buildroot}/%{_libdir}/openwsman/authenticators/*.la
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
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
mkdir -p %{buildroot}/%{_unitdir}
install -p -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}/openwsmand.service
install -m 644 etc/ssleay.cnf %{buildroot}/%{_sysconfdir}/openwsman
install -p -m 755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/openwsman
@@ -192,33 +191,20 @@ 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
%clean
rm -rf %{buildroot}
%post -n libwsman1 -p /sbin/ldconfig
%postun -n libwsman1 -p /sbin/ldconfig
%post server
/sbin/ldconfig
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
%systemd_post openwsmand.service
%preun server
if [ $1 = 0 ] ; then
/bin/systemctl --no-reload disable openwsmand.service > /dev/null 2>&1 || :
/bin/systemctl stop openwsmand.service > /dev/null 2>&1 || :
fi
%systemd_preun openwsmand.service
%postun server
rm -f /var/log/wsmand.log
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ "$1" -ge "1" ] ; then
/bin/systemctl try-restart openwsmand.service >/dev/null 2>&1 || :
fi
%systemd_postun_with_restart openwsmand.service
/sbin/ldconfig
%post client -p /sbin/ldconfig
@@ -226,45 +212,38 @@ fi
%postun client -p /sbin/ldconfig
%files -n libwsman1
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%doc AUTHORS COPYING ChangeLog README.md TODO
%{_libdir}/libwsman.so.*
%{_libdir}/libwsman_client.so.*
%{_libdir}/libwsman_curl_client_transport.so.*
%files -n libwsman-devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
%doc AUTHORS COPYING ChangeLog README
%doc AUTHORS COPYING ChangeLog README.md
%files python
%defattr(-,root,root,-)
%{python_sitearch}/*.so
%{python_sitearch}/*.py
%{python_sitearch}/*.pyc
%{python_sitearch}/*.pyo
%doc AUTHORS COPYING ChangeLog README
%doc AUTHORS COPYING ChangeLog README.md
#%files ruby
#%defattr(-,root,root,-)
#%{ruby_sitearch}/openwsman.so
#%{ruby_sitearch}/_openwsman.so
#%dir %{ruby_sitelib}/openwsman
#%{ruby_sitelib}/openwsman/*.rb
#%doc AUTHORS COPYING ChangeLog README
%files ruby
%{ruby_sitearch}/_openwsman.so
%dir %{ruby_sitelib}/openwsman
%{ruby_sitelib}/openwsman/*.rb
%doc AUTHORS COPYING ChangeLog README.md
%files perl
%defattr(-,root,root,-)
%{perl_vendorarch}/openwsman.so
%{perl_vendorlib}/openwsman.pm
%doc AUTHORS COPYING ChangeLog README
%doc AUTHORS COPYING ChangeLog README.md
%files server
# Don't remove *.so files from the server package.
# the server fails to start without these files.
%defattr(-,root,root,-)
%dir %{_sysconfdir}/openwsman
%config(noreplace) %{_sysconfdir}/openwsman/openwsman.conf
%config(noreplace) %{_sysconfdir}/openwsman/ssleay.cnf
@@ -282,22 +261,47 @@ fi
%{_sbindir}/openwsmand
%{_libdir}/libwsman_server.so.*
%{_mandir}/man8/*
%doc AUTHORS COPYING ChangeLog README
%doc AUTHORS COPYING ChangeLog README.md
%files client
%defattr(-,root,root,-)
%{_libdir}/libwsman_clientpp.so.*
%config(noreplace) %{_sysconfdir}/openwsman/openwsman_client.conf
%doc AUTHORS COPYING ChangeLog README
%doc AUTHORS COPYING ChangeLog README.md
%changelog
* Mon May 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-5
* Thu Nov 08 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.6-1
- Update to openwsman-2.3.6
* Mon Sep 17 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.5-1
- Update to openwsman-2.3.5
- Enable ruby subpackage again
* Tue Aug 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-7
- Fix issues found by fedora-review utility in the spec file
* Thu Aug 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-6
- Use new systemd-rpm macros
Resolves: #850405
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sun Jun 10 2012 Petr Pisar <ppisar@redhat.com> - 2.3.0-4
- Perl 5.16 rebuild
* Mon May 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-3
- Rename service file
* Wed May 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-4
* Wed May 23 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-2
- Add systemd support
* Tue Mar 27 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-1
- Update to openwsman-2.3.0
* Thu Feb 09 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-4
- Fix libssl loading
* Thu Feb 09 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.7-3
- Temporarily disable ruby subpackage
+1 -2
View File
@@ -1,2 +1 @@
3958e97476aa94c506075e3cd165240d openwsman-2.2.5.tar.bz2
c72e3b34e25f393be8fd1ead6b4a5bae openwsman-2.2.7.tar.bz2
54eb12ce88c7750b240d6185df2d6716 openwsman-2.3.6.tar.bz2