[openwsman/f14/master] Forcing the ruby files to be installed in site{arch, lib}dir.

Praveen K Paladugu praveenp at fedoraproject.org
Mon Aug 2 21:33:48 UTC 2010


commit abc3a45733fb1ecfe6635132f08e8b0957c1dba7
Author: Praveen K Paladugu <praveenp at praveenp-dell.us.dell.com>
Date:   Mon Aug 2 16:34:24 2010 -0500

    Forcing the ruby files to be installed in site{arch,lib}dir.

 openwsman-sitelibdir.patch |   33 +++++++++++++++++++++++++++++++++
 openwsman.spec             |    9 +++++++++
 2 files changed, 42 insertions(+), 0 deletions(-)
---
diff --git a/openwsman-sitelibdir.patch b/openwsman-sitelibdir.patch
new file mode 100644
index 0000000..1343adb
--- /dev/null
+++ b/openwsman-sitelibdir.patch
@@ -0,0 +1,33 @@
+diff -up ./bindings/ruby/Makefile.am.diff ./bindings/ruby/Makefile.am
+--- ./bindings/ruby/Makefile.am.diff	2010-08-02 16:12:44.001965367 -0500
++++ ./bindings/ruby/Makefile.am	2010-08-02 16:16:14.133938138 -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:09:41.155964173 -0500
++++ ./bindings/ruby/openwsman/Makefile.am	2010-08-02 16:11:32.443949863 -0500
+@@ -2,11 +2,11 @@
+ # 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
+-	/bin/echo "PRAVEEN the libdir  value== $(rubylibdir)"
+ 	@INSTALL@ -m 0644 openwsman.rb $(DESTDIR)$(rubylibdir)/openwsman
+ 	@INSTALL@ -m 0644 xmlnode.rb $(DESTDIR)$(rubylibdir)/openwsman
+ 
diff --git a/openwsman.spec b/openwsman.spec
index 62b0e57..19468b3 100644
--- a/openwsman.spec
+++ b/openwsman.spec
@@ -27,6 +27,8 @@ Patch0:         %{name}-initscript.patch
 Patch1:         %{name}-randfile.patch
 Patch2:         %{name}-authors.patch
 Patch3:		%{name}-swig-ver-check.patch
+Patch4: 	%{name}-ruby-libdir.patch
+Patch5: 	%{name}-sitelibdir.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXXX)
 
 %description
@@ -141,6 +143,9 @@ This package provides Perl bindings to access the openwsman client API.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
 
 %build
 sh autoconfiscate.sh
@@ -266,6 +271,10 @@ fi
 
 
 %changelog
+* Mon Aug  2 2010 Praveen K Paladugu <praveen_paladugu at dell.com> - 2.2.3-7
+- Forcing all the ruby files to be installed in site{arch,lib}dir instead
+-   of vendor{arch,lib}dir following Fedora guidelines
+
 * Mon Aug  2 2010 Praveen K Paladugu <praveen_paladugu at dell.com> -2.2.3-6
 - Fixed swig version checking in acinclude.m4
 


More information about the scm-commits mailing list