- package ruby into vendor dirs

- rel 3

diff --git a/hivex.spec b/hivex.spec
index 7d3c7f229ec262cf011773e9e8f606a55c4adf9e..0582849b96c469e980d9e1e98907918c9e3843c8 100644 (file)
--- a/hivex.spec
+++ b/hivex.spec
@@ -7,11 +7,12 @@ Summary:      Windows Registry "hive" extraction library
 Summary(pl.UTF-8):     Biblioteka do wydobywania danych z plików "hive" Rejestru Windows
 Name:          hivex
 Version:       1.3.7
-Release:       2
+Release:       3
 License:       LGPL v2.1
 Group:         Libraries
 Source0:       http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz
 # Source0-md5: 61c1fbc8ec47633523da72ce51fc1b24
+Patch0:                ruby-vendor-not-site.patch
 URL:           http://libguestfs.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -129,8 +130,12 @@ Wiązania języka Ruby do biblioteki hivex.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__aclocal}
+%{__automake}
+%{__autoconf}
 %configure \
        --disable-silent-rules \
        %{__enable_disable static_libs static}
@@ -224,5 +229,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n ruby-hivex
 %defattr(644,root,root,755)
-%attr(755,root,root) %{ruby_sitearchdir}/_hivex.so
-%{ruby_sitelibdir}/hivex.rb
+%attr(755,root,root) %{ruby_vendorarchdir}/_hivex.so
+%{ruby_vendorlibdir}/hivex.rb

diff --git a/ruby-vendor-not-site.patch b/ruby-vendor-not-site.patch
new file mode 100644 (file)
index 0000000..94937ab
--- /dev/null
+++ b/ruby-vendor-not-site.patch
@@ -0,0 +1,22 @@
+--- hivex-1.3.3/ruby/Makefile.am.old   2012-02-08 10:57:43.447667670 +0000
++++ hivex-1.3.3/ruby/Makefile.am       2012-02-08 10:58:29.024440505 +0000
+@@ -47,13 +47,13 @@
+       $(RAKE) build
+       $(RAKE) rdoc
+ 
+-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
++RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
++RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
+ 
+ install:
+-      $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
+-      $(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
+-      $(INSTALL) -p -m 0644 lib/hivex.rb $(DESTDIR)$(RUBY_SITELIB)
+-      $(INSTALL) -p -m 0755 ext/hivex/_hivex.so $(DESTDIR)$(RUBY_SITEARCH)
++      $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORLIB)
++      $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORARCH)
++      $(INSTALL) -p -m 0644 lib/hivex.rb $(DESTDIR)$(RUBY_VENDORLIB)
++      $(INSTALL) -p -m 0755 ext/hivex/_hivex.so $(DESTDIR)$(RUBY_VENDORARCH)
+ 
+ endif