From 8a0b9f25c0da651c4871be28a8448ab51b4a90a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 19 Mar 2013 16:50:28 +0100 Subject: [PATCH] Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 --- .gitignore | 1 + openwsman-2.2.3-initscript.patch | 81 ----------------------------- openwsman-2.2.7-disable-ruby.patch | 12 ----- openwsman-sitelibdir.patch | 29 ----------- openwsman.spec | 16 ++---- openwsmand.8.gz | Bin 412 -> 0 bytes sources | 1 + 7 files changed, 7 insertions(+), 133 deletions(-) delete mode 100644 openwsman-2.2.3-initscript.patch delete mode 100644 openwsman-2.2.7-disable-ruby.patch delete mode 100644 openwsman-sitelibdir.patch delete mode 100644 openwsmand.8.gz diff --git a/.gitignore b/.gitignore index afa3613..92abbfb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ openwsman-2.2.3.tar.bz2 /openwsman-2.3.0.tar.bz2 /openwsman-2.3.5.tar.bz2 /openwsman-2.3.6.tar.bz2 +/openwsmand.8.gz diff --git a/openwsman-2.2.3-initscript.patch b/openwsman-2.2.3-initscript.patch deleted file mode 100644 index 768f0aa..0000000 --- a/openwsman-2.2.3-initscript.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -up openwsman-2.2.7/etc/init/openwsmand.sh.cmake.orig openwsman-2.2.7/etc/init/openwsmand.sh.cmake ---- openwsman-2.2.7/etc/init/openwsmand.sh.cmake.orig 2012-01-11 13:38:58.789392556 +0100 -+++ openwsman-2.2.7/etc/init/openwsmand.sh.cmake 2012-01-11 13:44:32.383593944 +0100 -@@ -4,28 +4,28 @@ - # Provides: openwsmand - # Required-Start: $remote_fs - # Required-Stop: $network --# Default-Start: 2 3 5 --# Default-Stop: 0 1 6 -+# Default-Start: -+# Default-Stop: - # Short-Description: Openwsman Daemon - # Description: openwsmand - # Start/Stop the Openwsman Daemon - ### END INIT INFO - # - # --# chkconfig: 2345 36 64 -+# chkconfig: - 36 64 - # description: Openwsman Daemon - # processname: openwsmand - - NAME=openwsmand - DAEMON=/usr/sbin/$NAME - OPTIONS=-S # with SSL --PIDFILE=/var/run/$NAME.pid -+PIDFILE=/var/run/wsmand.pid - - lsb=0 - - if [ $EUID != 0 ]; then - echo "This script must be run as root." -- exit 1; -+ exit 4; - fi - - if [ "$DESCRIPTIVE" = "" ]; then -@@ -65,6 +65,7 @@ start() - - echo "NOTE: The script uses /dev/random device for generating some random bits while generating the server key." - echo " If this takes too long, you can replace the value of \"RANDFILE\" in @SYSCONFDIR@/ssleay.cnf with /dev/urandom. Please understand the implications of replacing the RNADFILE." -+ exit 6 # Six means "program is not configured", seems to be suitable value - - fi - fi -@@ -103,6 +104,9 @@ case "$1" in - stop) - stop - rm -f $lockfile -+ # pid file should be removed by server itself, but it's marked as -+ # TODO in wsmand.c source file;) -+ rm -f $PIDFILE - ;; - - restart) -@@ -137,6 +141,16 @@ case "$1" in - echo " running" - else - echo " stopped" -+ if [ -e $PIDFILE ]; then -+ echo " stopped, but pid file exists" -+ exit 1 -+ elif [ -e $lockfile ]; then -+ echo " stopped, but lock file exists" -+ exit 2 -+ else -+ echo " stopped" -+ exit 3 -+ fi - fi - fi - ;; -@@ -147,6 +161,8 @@ case "$1" in - - *) - echo "Usage: $0 {restart|start|stop|reload|force-reload|status|condrestart}" -+ [ "$1" = "usage" ] && exit 0 -+ exit 2 - esac - - if [ $lsb -ne 0 ]; then diff --git a/openwsman-2.2.7-disable-ruby.patch b/openwsman-2.2.7-disable-ruby.patch deleted file mode 100644 index 4605d3b..0000000 --- a/openwsman-2.2.7-disable-ruby.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 ) - IF( BUILD_RUBY ) - OPTION( BUILD_RUBY_GEM "Build Ruby GEM" YES ) - ENDIF( BUILD_RUBY ) diff --git a/openwsman-sitelibdir.patch b/openwsman-sitelibdir.patch deleted file mode 100644 index 0cc4f4a..0000000 --- a/openwsman-sitelibdir.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up ./bindings/ruby/Makefile.am.diff ./bindings/ruby/Makefile.am ---- ./bindings/ruby/Makefile.am.diff 2010-08-02 16:57:20.407937479 -0500 -+++ ./bindings/ruby/Makefile.am 2010-08-02 16:57:54.718188163 -0500 -@@ -4,8 +4,10 @@ - - SUBDIRS = openwsman tests - --rubyarchdir = $(shell ruby -r rbconfig -e "vad = Config::CONFIG['vendorarchdir']; print(vad ? vad : Config::CONFIG['sitearchdir'])") --rubydir = $(shell ruby -r rbconfig -e "vd = Config::CONFIG['vendorlibdir']; print(vd ? vd : Config::CONFIG['sitelibdir'])") -+#rubyarchdir = $(shell ruby -r rbconfig -e "vad = Config::CONFIG['vendorarchdir']; print(vad ? vad : Config::CONFIG['sitearchdir'])") -+rubyarchdir = $(shell ruby -r rbconfig -e " print( Config::CONFIG['sitearchdir'])") -+#rubydir = $(shell ruby -r rbconfig -e "vd = Config::CONFIG['vendorlibdir']; print(vd ? vd : Config::CONFIG['sitelibdir'])") -+rubydir = $(shell ruby -r rbconfig -e " print(Config::CONFIG['sitelibdir'])") - rubyincdir = $(shell ruby -r rbconfig -e "print(Config::CONFIG['archdir'])") - - INCLUDES = \ -diff -up ./bindings/ruby/openwsman/Makefile.am.diff ./bindings/ruby/openwsman/Makefile.am ---- ./bindings/ruby/openwsman/Makefile.am.diff 2010-08-02 16:58:05.201189127 -0500 -+++ ./bindings/ruby/openwsman/Makefile.am 2010-08-02 16:58:20.999937941 -0500 -@@ -2,7 +2,8 @@ - # Makefile.am for openwsman/bindings/ruby/openwsman - # - --rubylibdir = $(shell ruby -r rbconfig -e "vld = Config::CONFIG['vendorlibdir']; print(vld ? vld : Config::CONFIG['sitelibdir'])") -+#rubylibdir = $(shell ruby -r rbconfig -e "vld = Config::CONFIG['vendorlibdir']; print(vld ? vld : Config::CONFIG['sitelibdir'])") -+rubylibdir = $(shell ruby -r rbconfig -e "print( Config::CONFIG['sitelibdir'])") - - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(rubylibdir)/openwsman diff --git a/openwsman.spec b/openwsman.spec index f9ab1ac..63ae54e 100644 --- a/openwsman.spec +++ b/openwsman.spec @@ -3,8 +3,6 @@ %{!?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 -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 @@ -28,7 +26,6 @@ Source1: openwsmand.8.gz Source2: openwsmand.service # script for testing presence of the certificates in ExecStartPre Source3: owsmantestcert.sh -Patch0: %{name}-sitelibdir.patch Patch1: openwsman-2.2.7-libssl.patch %description @@ -147,8 +144,6 @@ This package provides Perl bindings to access the openwsman client API. %prep %setup -q -# don't make backup of file patched by patch0, it'll be installed... -%patch0 -p1 %patch1 -p1 -b .libssl %build @@ -182,9 +177,8 @@ cd .. rm -f %{buildroot}/%{_libdir}/*.la rm -f %{buildroot}/%{_libdir}/openwsman/plugins/*.la rm -f %{buildroot}/%{_libdir}/openwsman/authenticators/*.la -[ -d %{buildroot}/%{ruby_sitelib} ] && rm -f %{buildroot}/%{ruby_sitelib}/openwsmanplugin.rb -[ -d %{buildroot}/%{ruby_sitelib} ] && rm -f %{buildroot}/%{ruby_sitelib}/openwsman.rb -[ -d %{buildroot/}%{ruby_vendorlib} ] && rm -f %{buildroot}/%{ruby_vendorlib}/openwsmanplugin.rb +[ -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 @@ -240,9 +234,9 @@ rm -f /var/log/wsmand.log %doc AUTHORS COPYING ChangeLog README.md %files ruby -%{ruby_sitearch}/_openwsman.so -%dir %{ruby_sitelib}/openwsman -%{ruby_sitelib}/openwsman/*.rb +%{ruby_vendorarchdir}/_openwsman.so +%dir %{ruby_vendorlibdir}/openwsman +%{ruby_vendorlibdir}/openwsman/*.rb %doc AUTHORS COPYING ChangeLog README.md #%files java diff --git a/openwsmand.8.gz b/openwsmand.8.gz deleted file mode 100644 index 4d0729b16d7238dd4da654ce099820961f9cd589..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmV;N0b~9jiwFovX5vf$18;C;Zg+ESVQyqDH~?jlO;6)65Qgvm6{DQjQQ)vbXctsy zrAC4h)kPfE9MWWxT5@d5AFTTC*G?)D*qiNn=JEJ-e%OLGsQ$X4RxM;V8Du;Cfx{6k zTo+eGMsl`=-RgNm796MW#yEYhRo&x&$^%3Dfp&z~8}_&_t3&y+i+cvytBcfaG?mp- z^5?~Pp;eye??CdZB3qOOrb9>aZACb}{{g&v;FQx-Eb?wYf-7UBXzB#c{2}rQWs&;q za!#hESBJpZ6Bup%Otwq1#bf9b%Y1D;v^5UVE);ayVsCYb6Q`+tunJ;j$R^|u!LC980BjTPfh#uA#8jkae_rJlZdbOkH!2wSkQ|3u;GLXv-zyw#4= G0ssJy>dZI* diff --git a/sources b/sources index de5d449..56c6960 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 54eb12ce88c7750b240d6185df2d6716 openwsman-2.3.6.tar.bz2 +57979ad828cabf969adac186642f69bc openwsmand.8.gz